--- a/messagingappbase/mce/src/MceMessageListView.cpp	Mon Mar 15 12:40:06 2010 +0200
+++ b/messagingappbase/mce/src/MceMessageListView.cpp	Wed Mar 31 21:25:02 2010 +0300
@@ -228,15 +228,7 @@
     // Reset the sort order
     iFolderItemArray->Reset();
        }
-	if ( iMsgListContainer &&
-	     iCurrentListType != GetFolderListBoxType())
-	    {
-	    ListboxTypeChangedL();
-	    }
-	else
-	    {
-	    CreateListboxL();        
-	    }	    
+	    
     if ( iMsgListContainer )
         {
         iMsgListContainer->SetSortTypeL( iSortOrder, iOrdering );
@@ -245,7 +237,6 @@
     TMsvId id = 0;
     TBool editorLaunched = EFalse;
     TBool launchingFromOutside = EFalse;  
-    TInt  msgMtmUid = 0;
     TMsvId service = KMsvLocalServiceIndexEntryId;
     TMsvEntry entry;
     
@@ -273,18 +264,19 @@
         	{
             // Set the folder based on the given ID
             iFolderId = aCustomMessageId.iUid;
-            // this is performance optimization, start to launch viewer before container creation
-            if ( !iMsgListContainer && entry.Id() == KMsvGlobalInBoxIndexEntryId )
-                {
-                if ( LaunchViewerWhenOneUnreadL( msgMtmUid ) > KErrNotFound )
-                    {
-                    editorLaunched = ETrue;
-                    }
-                }
+
         	}
         iMceUi->SetDontExitOnNextOperationComplete();
         }
-
+	if ( iMsgListContainer &&
+	     iCurrentListType != GetFolderListBoxType())
+	    {
+	    ListboxTypeChangedL();
+	    }
+	else
+	    {
+	    CreateListboxL();        
+	    }
     
     
     if ( iMsgListContainer && aPrevViewId == TDRVIEWID )
@@ -1222,7 +1214,7 @@
             switch ( currentEntry.iType.iUid )
                 {
                 case KUidMsvMessageEntryValue:
-                    if ( currentEntry.Parent() != KMsvGlobalOutBoxIndexEntryId )
+                    if (( currentEntry.Parent() != KMsvGlobalOutBoxIndexEntryId) && (iFolderId != KMsvGlobalOutBoxIndexEntryId))
                         {
                         EditEntryL();
                         }