--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue May 25 12:41:50 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Wed Jun 09 09:41:11 2010 +0300
@@ -172,11 +172,11 @@
             CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
             if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
                 {
-                TPhoneCmdParamBoolean isProgressNoteVisible;
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsProgressNoteVisible,
-                      &isProgressNoteVisible );
+                TPhoneCmdParamBoolean isNoteVisible;
+                iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsNoteVisible,
+                      &isNoteVisible );
 
-                if ( !isProgressNoteVisible.Boolean() )
+                if ( !isNoteVisible.Boolean() )
                     {
                     ShowNoteL( EPhoneEmergencyConnectWaitNote );
                     UpdateSetupCbaL();
@@ -667,15 +667,6 @@
 
     switch( aCommand )
         {
-        case EPhoneInCallCmdDtmfManualQuery:
-            if ( iStateMachine->PhoneEngineInfo()->CallState( KPEEmergencyCallId ) == EPEStateDialing )
-                {
-                // Remove emergency connecting note
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
-                }
-            commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
-            break;
-
         case EPhoneDtmfDialerExit:      // fall through
         case EPhoneDtmfDialerCancel:
              {
@@ -683,11 +674,11 @@
                  {
                  CloseDTMFEditorL();
 
-                 TPhoneCmdParamBoolean isProgressNoteVisible;
-                 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsProgressNoteVisible,
-                        &isProgressNoteVisible );
+                 TPhoneCmdParamBoolean isNoteVisible;
+                 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetIsNoteVisible,
+                        &isNoteVisible );
 
-                 if ( !isProgressNoteVisible.Boolean() )
+                 if ( !isNoteVisible.Boolean() )
                      {
                      ShowNoteL( EPhoneEmergencyConnectWaitNote );
                      UpdateSetupCbaL();