--- a/emailuis/emailui/src/FreestyleEmailUiViewBase.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailuis/emailui/src/FreestyleEmailUiViewBase.cpp	Fri Feb 19 22:37:30 2010 +0200
@@ -110,6 +110,12 @@
     TRAPD( error, ChildDoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage) );
     if ( !error )
         {
+        //view history have to be updated once again when email is sent to background when in plugin settings and composer is activated externaly
+        //when composer view will be deactivated it wiil call NavigateBack;
+        if (pluginSettingsActive && iAppUi.CurrentActiveView()->Id() == MailEditorId)
+        	{
+        	iAppUi.ReturnFromPluginSettingsView();
+        	}
         // View activated succesfully. Change visible control group, but not
         // when application is being sent to background.
         if ( !iAppUi.SwitchingToBackground() )
@@ -437,10 +443,9 @@
 void CFsEmailUiViewBase::HandleAppForegroundEventL( TBool aForeground )
     {
     FUNC_LOG;
+    HandleForegroundEventL(aForeground);    
     if ( aForeground )
         {
-        HandleForegroundEventL();
-
         // Activate control group in case the view was activated when
         // application was being sent to background, and the control group
         // was left inactive.
@@ -556,7 +561,7 @@
 
 // ---------------------------------------------------------------------------
 //
-void CFsEmailUiViewBase::HandleForegroundEventL()
+void CFsEmailUiViewBase::HandleForegroundEventL( TBool /*aForeground*/ )
     {
     FUNC_LOG;
     }