--- a/emailuis/emailui/src/FreestyleEmailUiSettingsList.cpp	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailuis/emailui/src/FreestyleEmailUiSettingsList.cpp	Fri Mar 12 15:41:14 2010 +0200
@@ -60,7 +60,7 @@
 #include "FreestyleEmailUiShortcutBinding.h"
 #include "FreestyleEmailUiUtilities.h"
 #include "FSEmail.pan"
-
+#include "fsemailstatuspaneindicatorhandler.h"
 // CONSTANTS
 
 
@@ -499,6 +499,11 @@
         	 aEventType == EEventEnterKeyPressed )
             {
             HandleUserSelectionsL();
+            //  Fix for EJSA-82HB3F, improves fix for EELN-7Y78DM
+            //  Update title pane, needed for touch support
+            HBufC* text = CreateTitlePaneTextLC();
+            iAppUi.SetTitlePaneTextL( *text );
+            CleanupStack::PopAndDestroy( text );
             }
         }
 
@@ -561,10 +566,6 @@
             iPIMListActivation = ETrue;
             SetSelectedMainListIndex( index );
             CreatePluginPIMListL( iSelectedPluginSettings );
-            // Update the title pane, needed for touch support
-            HBufC* text = CreateTitlePaneTextLC();
-            iAppUi.SetTitlePaneTextL( *text );
-            CleanupStack::PopAndDestroy( text );
             }
         else // index < 0; this should never happen
             {
@@ -1587,8 +1588,10 @@
             iWaitDialog->PrepareLC( R_FS_WAIT_NOTE_REMOVING_MAILBOX );
             iWaitDialog->SetCallback( this );
             iWaitDialog->RunLD();
-            // Set email indicator off.
-            TFsEmailUiUtility::ToggleEmailIconL(EFalse);
+
+            //emailindicator handling, we dont care if something goes wrong in the mailindicator update. 
+            TRAP_IGNORE(TFsEmailStatusPaneIndicatorHandler::StatusPaneMailIndicatorHandlingL( mailBox->GetId().Id()));
+            
             // delete mailbox and wait event (RequestResponseL)
             iDeleteMailboxId = iMailClient.DeleteMailBoxByUidL( mailBox->GetId(), *this );
             wasDeleted = ETrue;