diff -r 5b238bc8ffb6 -r 01504893d9cb photosgallery/viewframework/views/listview/src/glxlistviewimp.cpp
--- a/photosgallery/viewframework/views/listview/src/glxlistviewimp.cpp	Wed Sep 15 12:13:06 2010 +0300
+++ b/photosgallery/viewframework/views/listview/src/glxlistviewimp.cpp	Wed Oct 13 14:32:09 2010 +0300
@@ -182,6 +182,22 @@
     {
     TRACER("CGlxListViewImp::DoMLViewActivateL");  
     
+    TUint transitionID = (iUiUtility->ViewNavigationDirection()==
+         EGlxNavigationForwards)?KActivateTransitionId:KDeActivateTransitionId;
+		
+    //Do the activate animation only for views other than mainlist view and
+	//on backward navigation from any other views to main list view, since 
+	//for the app start the animation effect is by default provided.
+    if (iMediaList->IdSpaceId(0) != KGlxIdSpaceIdRoot || 
+           transitionID == KDeActivateTransitionId) 
+        {
+    	GfxTransEffect::BeginFullScreen( transitionID, TRect(),
+                                   AknTransEffect::EParameterType, 
+                         AknTransEffect::GfxTransParam( KPhotosUid, 
+                         AknTransEffect::TParameter::EEnableEffects) );   
+    	GfxTransEffect::EndFullScreen();
+    	}
+    
     iNextViewActivationEnabled = ETrue;
     if(StatusPane())
         {
@@ -290,23 +306,6 @@
     CreateListL();
     iProgressIndicator = CGlxProgressIndicator::NewL(*this);
     iMMCNotifier = CGlxMMCNotifier::NewL(*this);
-    
-    TUint transitionID = (iUiUtility->ViewNavigationDirection()==
-             EGlxNavigationForwards)?KActivateTransitionId:KDeActivateTransitionId;
-    		
-	//Do the activate animation only for views other than mainlist view and
-	//on backward navigation from any other views to main list view, since 
-	//for the app start the animation effect is by default provided.
-	if (iMediaList->IdSpaceId(0) != KGlxIdSpaceIdRoot || 
-		   transitionID == KDeActivateTransitionId) 
-		{
-		GfxTransEffect::BeginFullScreen( transitionID, TRect(),
-								   AknTransEffect::EParameterType, 
-						 AknTransEffect::GfxTransParam( KPhotosUid, 
-						 AknTransEffect::TParameter::EEnableEffects) ); 
-		iIsTransEffectStarted = ETrue;
-		}
-        
     }
 
 // ---------------------------------------------------------------------------
@@ -633,12 +632,6 @@
     if (iMediaList->FocusIndex() != EGlxListItemAll || iMediaList->IdSpaceId(
             0) != KGlxIdSpaceIdRoot)
         {
-        // Delete the bitmap; otherwise this memory will be leaked
-        if (aBitmap)
-            {
-            delete aBitmap;
-            aBitmap = NULL;
-            }
         GLX_LOG_INFO("CGlxListViewImp::PreviewTNReadyL()- Ignore!");
         return;
         }
@@ -722,6 +715,16 @@
             HBufC* emptyText = StringLoader::LoadLC(R_LIST_EMPTY_VIEW_TEXT); 
             iList->SetEmptyTextL(*emptyText);
             CleanupStack::PopAndDestroy(emptyText);
+            
+            //While coming back to main listview
+            TGlxIdSpaceId id = iMediaList->IdSpaceId(0);
+            if((id == KGlxIdSpaceIdRoot) && (mediaCount > 0))
+                {            
+                for (TInt i = 0; i < mediaCount; i++)
+                    {
+                    SetDefaultThumbnailL(i);
+                    }
+                }            
             }		
         
 		//Fix for ESLM-7SAHPT::Clear Flag to Disable QWERTY search input in list view
@@ -739,18 +742,11 @@
 		
 	if (mediaCount)
 	    {
-        TGlxIdSpaceId id = iMediaList->IdSpaceId(0);
-
 		for (TInt i=0; i<mediaCount; i++)
 			{
 		   	const TGlxMedia& item = iMediaList->Item(i);
 			iList->ItemL(i).SetTitleL(item.Title());
 			iList->ItemL(i).SetTextL(item.SubTitle());
-            // Set the default TNs for the main listview
-            if (id == KGlxIdSpaceIdRoot)
-                {
-                SetDefaultThumbnailL(i);
-                }
 			}
 		GLX_DEBUG3("CGlxListViewImp::CreateListL() Medialist Count = %d, "
 		        "iLastFocusIndex %d",mediaCount,iLastFocusedIndex);