--- a/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp	Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp	Wed Aug 18 09:48:26 2010 +0300
@@ -121,12 +121,6 @@
                 EBasic, 
                 EPhoneUIStates,
                 "CPhoneGeneralGsmMessagesHandler::EPEMessageIssuedSSRequest" );
-
-            TPhoneCmdParamBoolean booleanParam;
-            booleanParam.SetBoolean( EFalse );
-            iViewCommandHandle.ExecuteCommandL( 
-                EPhoneViewSetBlockingDialogStatus, 
-                &booleanParam );
             break;
             }
             
@@ -161,32 +155,11 @@
                 EPhoneViewSetGlobalNotifiersDisabled,
                 &globalNotifierParam );
             
-            TPhoneCmdParamBoolean booleanParam;
-            booleanParam.SetBoolean( ETrue );
-            iViewCommandHandle.ExecuteCommandL( 
-                EPhoneViewSetBlockingDialogStatus, 
-                &booleanParam );
-            
             // Get active call count
             TPhoneCmdParamInteger activeCallCount;
             iViewCommandHandle.ExecuteCommandL(
                 EPhoneViewGetCountOfActiveCalls, &activeCallCount );
             
-            if( !activeCallCount.Integer() )
-                {
-                __PHONELOG(
-                    EBasic, 
-                    EPhoneUIStates,
-                    "CPhoneGeneralGsmMessagesHandler::EPEMessageIssuingSSRequest no active call" );
-                // Ensure that the dialer is activated to display local notes and dialogs properly.
-                TPhoneCmdParamAppInfo param;
-                param.SetAppUid( KUidPhoneApplication );
-                param.SetViewUid( KUidViewId );
-                param.SetCustomMessageId( TUid::Uid( KTouchDiallerViewCommand ) );
-                iViewCommandHandle.ExecuteCommandL( 
-                    EPhoneViewActivateAppViewWithCustomMessage, 
-                    &param );
-                }
             // Remove phoneumber query
             iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveQuery );
             break;
@@ -229,12 +202,13 @@
             &globalNotifierParam );
             
         TPhoneCmdParamGlobalNote globalNoteParam;
+        PhoneNotificationType type = aNotificationDialog ? 
+                EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+        globalNoteParam.SetType( type );
       
-        globalNoteParam.SetType( EAknGlobalInformationNote );
         globalNoteParam.SetTextResourceId( 
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
-        globalNoteParam.SetTone( EAvkonSIDInformationTone );
         globalNoteParam.SetNotificationDialog( aNotificationDialog );
 
         iViewCommandHandle.ExecuteCommandL( 
@@ -276,11 +250,12 @@
             &globalNotifierParam );
             
         TPhoneCmdParamGlobalNote globalNoteParam;
-        globalNoteParam.SetType( EAknGlobalErrorNote );
+        PhoneNotificationType type = aNotificationDialog ? 
+                EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+        globalNoteParam.SetType( type );
         globalNoteParam.SetTextResourceId( 
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
-        globalNoteParam.SetTone( CAknNoteDialog::EErrorTone );
         globalNoteParam.SetNotificationDialog( aNotificationDialog );
         
         iViewCommandHandle.ExecuteCommandL(