--- a/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp	Mon Aug 23 15:42:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp	Fri Sep 03 13:33:36 2010 +0300
@@ -79,10 +79,9 @@
     MPhoneState& aActiveState )
     {
     CPhoneGeneralGsmMessagesHandler* self = new( ELeave ) 
-        CPhoneGeneralGsmMessagesHandler( aStateMachine, 
+            CPhoneGeneralGsmMessagesHandler( aStateMachine, 
                                          aViewCommandHandle,
                                          aActiveState );
-    
     return self;
     }
 
@@ -96,7 +95,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneGeneralGsmMessagesHandler::HandlePhoneEngineMessageL()" );
-
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageCallBarred:
@@ -121,8 +119,8 @@
                 EBasic, 
                 EPhoneUIStates,
                 "CPhoneGeneralGsmMessagesHandler::EPEMessageIssuedSSRequest" );
+            }
             break;
-            }
             
         case MEngineMonitor::EPEMessageIssuingSSRequest:
             {
@@ -130,41 +128,19 @@
                 EBasic, 
                 EPhoneUIStates,
                 "CPhoneGeneralGsmMessagesHandler::EPEMessageIssuingSSRequest" );
-                    
             iStateMachine.SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
-             
-            // Remove number entry from screen
-            if ( !FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) &&
-                 iViewCommandHandle.HandleCommandL( 
-                     EPhoneViewGetNumberEntryIsVisibleStatus ) == 
-                     EPhoneViewResponseSuccess )  
-                {            
-                iViewCommandHandle.ExecuteCommandL( 
-                    EPhoneViewRemoveNumberEntry );
-                }
-            else if ( FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) )
-                {
-                iViewCommandHandle.ExecuteCommandL( 
-                    EPhoneViewClearNumberEntryContent );
-                }
-
-            // Enable global notes
+            iViewCommandHandle.ExecuteCommandL( 
+                EPhoneViewClearNumberEntryContent );
+            
             TPhoneCmdParamBoolean globalNotifierParam;
             globalNotifierParam.SetBoolean( EFalse );
             iViewCommandHandle.ExecuteCommandL( 
                 EPhoneViewSetGlobalNotifiersDisabled,
                 &globalNotifierParam );
-            
-            // Get active call count
-            TPhoneCmdParamInteger activeCallCount;
-            iViewCommandHandle.ExecuteCommandL(
-                EPhoneViewGetCountOfActiveCalls, &activeCallCount );
+            iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveQuery );
+            }
+            break;
             
-            // Remove phoneumber query
-            iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveQuery );
-            break;
-            }
-
         case MEngineMonitor::EPEMessageTempClirActivationUnsuccessful:
             SendGlobalErrorNoteL( EPhoneSSNotifCLIRSupprReject, ETrue );
             break;
@@ -195,7 +171,6 @@
     if ( CPhonePubSubProxy::Instance()->Value( 
             KPSUidUikon, KUikGlobalNotesAllowed ) == 1 )
         {
-        // Re-enable global notes
         TPhoneCmdParamBoolean globalNotifierParam;
         globalNotifierParam.SetBoolean( EFalse );
         iViewCommandHandle.ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
@@ -224,9 +199,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneGeneralGsmMessagesHandler::HandleIncomingCallForwardedL()" );
-    
     iActiveState.SetDivertIndication( ETrue );
-    
     }
 
 // ---------------------------------------------------------
@@ -239,11 +212,9 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneGeneralGsmMessagesHandler::SendGlobalErrorNoteL()" );
     __ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
-
     if ( CPhonePubSubProxy::Instance()->Value( 
             KPSUidUikon, KUikGlobalNotesAllowed ) == 1 )
         {
-        // Re-enable global notes
         TPhoneCmdParamBoolean globalNotifierParam;
         globalNotifierParam.SetBoolean( EFalse );
         iViewCommandHandle.ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,