--- a/emailuis/emailui/src/FreestyleEmailUiViewBase.cpp	Thu Jul 15 18:19:25 2010 +0300
+++ b/emailuis/emailui/src/FreestyleEmailUiViewBase.cpp	Thu Aug 19 09:38:05 2010 +0300
@@ -175,10 +175,10 @@
                 }
             CleanupStack::PopAndDestroy(); // dimmedItems.Close()
             toolbar->SetToolbarObserver(this);
- 			if(resourceId == R_FREESTYLE_EMAIL_UI_TOOLBAR_FOLDER_LIST)
-            	{
-            	toolbar->SetToolbarVisibility(EFalse);
-				}
+
+            TBool toolbarVisible = ( resourceId != R_FREESTYLE_EMAIL_UI_TOOLBAR_FOLDER_LIST ); 
+            toolbar->SetToolbarVisibility( toolbarVisible ); 
+
             SetToolbar(toolbar);
             ShowToolbar();
             }
@@ -208,7 +208,6 @@
         CAknToolbar* toolbar(Toolbar());
         if (toolbar)
             {
-            // toolbar->SetToolbarVisibility(EFalse);
             toolbar->MakeVisible(EFalse);
             }
         }
@@ -224,8 +223,7 @@
         CAknToolbar* toolbar(Toolbar());
         if (toolbar)
             {
-            // toolbar->SetToolbarVisibility(ETrue);
-            toolbar->MakeVisible(ETrue);
+            toolbar->MakeVisible( ETrue );
             }
         }
     }
@@ -269,14 +267,14 @@
         TApaTaskList taskList( iEikonEnv->WsSession() );
         TApaTask prevAppTask = taskList.FindApp( iPreviousAppUid );
         TApaTask fsEmailTask = taskList.FindApp( KFSEmailUiUid );
+        if ( fsEmailTask.Exists() && iPreviousAppUid != KMessageReaderUid )
+            {
+            fsEmailTask.SendToBackground();
+            }
         if ( prevAppTask.Exists() )
             {
             prevAppTask.BringToForeground();
             }
-        if ( fsEmailTask.Exists() && iPreviousAppUid != KMessageReaderUid )
-            {
-            fsEmailTask.SendToBackground();
-            }
 
         iAppUi.SetSwitchingToBackground( EFalse );
         }