--- a/photosgallery/viewframework/medialists/src/glxattributecontext.cpp	Wed Apr 14 15:57:24 2010 +0300
+++ b/photosgallery/viewframework/medialists/src/glxattributecontext.cpp	Tue Apr 27 16:37:53 2010 +0300
@@ -236,12 +236,14 @@
         return;
         }
 
+    CleanupClosePushL(aAttributes);
     // Just list all attributes specified for this context
     TInt count = iAttributes.Count();
     for (TInt i = 0; i < count; i++) 
         {
         aAttributes.AppendL(iAttributes[i]);
         }
+    CleanupStack::Pop(&aAttributes);
     }
 
 // -----------------------------------------------------------------------------
@@ -343,7 +345,7 @@
         const TMPXAttribute& aAttribute) const
     {
     TRACER("CGlxAttributeContext::AddItemAttributeL");
-    
+    CleanupClosePushL(aAttributes);
     TIdentityRelation<TMPXAttribute> match(&TMPXAttribute::Match);
     TInt index = aAttributes.Find(aAttribute, match);
 
@@ -351,6 +353,7 @@
         {
         aAttributes.AppendL(aAttribute);
         }
+    CleanupStack::Pop(&aAttributes);
     }
 
 // -----------------------------------------------------------------------------