--- a/messagingappbase/mce/src/mceui.cpp	Wed Sep 15 12:08:45 2010 +0300
+++ b/messagingappbase/mce/src/mceui.cpp	Wed Oct 13 14:27:34 2010 +0300
@@ -22,7 +22,6 @@
 // INCLUDE FILES
 #include <bldvariant.hrh>
 #include <featmgr.h>
-#include <mtmuidef.hrh> 
 
 #include <messagingvariant.hrh>
 #include <centralrepository.h>
@@ -205,7 +204,7 @@
 _LIT( KMmsMessageDumpDirectory, "C:\\Private\\1000484b\\mmsvar");
 _LIT( KRootPath, "C:\\" );
 const TInt KMmsCodecClientChunkSize = 1024;
-#define KMtmUiFunctionSimDialog  ( KMtmFirstFreeMtmUiFunctionId + 1 )
+
 // LOCAL FUNCTION PROTOTYPES
 
 //  ==================== LOCAL FUNCTIONS ====================
@@ -233,8 +232,7 @@
     iAnchorId( NULL ),
     iEmailClientIntegration(EFalse),
     iSelectableEmail(EFalse),
-    iEmailFramework(EFalse),
-    iSimDialogOpen(EFalse)
+    iEmailFramework(EFalse)
     {
     iMceUiFlags.SetMceFlag( EMceUiFlagsExitOnMsvMediaAvailableEvent );
     }
@@ -833,7 +831,6 @@
     switch (aCommand)
         {
         case EEikCmdExit:
-            iSimDialogOpen = EFalse;
             Exit();
             break;
         case EMceCmdExit:
@@ -4492,10 +4489,6 @@
     TBuf8<1> buf;
     if (!(aFunction.iFlags&EMtudAsynchronous))
         {
-        if(aFunction.iFuncId == KMtmUiFunctionSimDialog)
-            {
-            iSimDialogOpen = ETrue;
-            }
         mtmUi.InvokeSyncFunctionL(aFunction.iFuncId, *sel, buf);
         }
     else
@@ -4982,11 +4975,6 @@
         {
         return;
         }
-    if( !MceViewActive( EMceDeliveryReportsViewActive ) &&
-            iMceListView->MarkingMode() )
-        {
-        return;
-        }
     TInt count = iTabsArray->Count();
     TMsvId newId = KMsvGlobalInBoxIndexEntryId;
     if ( aIndex < count )
@@ -6666,35 +6654,18 @@
 // ----------------------------------------------------
 void CMceUi::ResetAndHide()
     {
-    if( MceViewActive( EMceMessageViewActive ) && iMceListView
-            && iMceListView->MarkingMode() )
-        {
-        iMceListView->SetMarkingModeOff();
-        iMceListView->SetMarkingMode( EFalse );
-        RemoveTabs();
-        delete iDecoratedTabGroup;
-        iDecoratedTabGroup = NULL;
-        delete iTabsArray;
-        iTabsArray = NULL;
-        SetCustomControl(1);    // Disable bring-to-foreground on view activation
-        TRAP_IGNORE( CAknViewAppUi::CreateActivateViewEventL( \
-            KMessagingCentreMainViewUid, \
-            TUid::Uid(KMceHideInBackground), \
-            KNullDesC8 ) ) ;
-        }    
     // Messaging was not exiting properly when "exit" is pressed from settings dialog.
     // iMceUiFlags.MceFlag( EMceUiFlagsSettingsDialogOpen ) will be true 
     // when we exit from any of the settings Dialog. 
     // Closing of Settings dialogs will be taken care by AVKON. 
-    else if (!(MceViewActive( EMceMainViewActive) && IsForeground()) ||  
-	      iMceUiFlags.MceFlag( EMceUiFlagsSettingsDialogOpen ) || iSimDialogOpen )
+    if( !(MceViewActive( EMceMainViewActive ) && IsForeground() ) ||  
+	      iMceUiFlags.MceFlag( EMceUiFlagsSettingsDialogOpen ) )
         {
         SetCustomControl(1);    // Disable bring-to-foreground on view activation
         TRAP_IGNORE( CAknViewAppUi::CreateActivateViewEventL( \
             KMessagingCentreMainViewUid, \
             TUid::Uid(KMceHideInBackground), \
             KNullDesC8 ) ) ;
-        iSimDialogOpen = EFalse;
         }
     else
         {