--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -325,10 +325,11 @@
         iViewCommandHandle->ExecuteCommandL(
             EPhoneViewCreateEmergencyCallHeader,
             aCallId );
-       
+        
         SetBackButtonActive(EFalse);
+        
+        UpdateSetupCbaL();
         EndUiUpdate();
-        UpdateSetupCbaL();
         }
     }
 // -----------------------------------------------------------
@@ -343,18 +344,12 @@
     globalNotifierParam.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
-          &globalNotifierParam );
     
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNote );
 
-    // Notify the view
-    iViewCommandHandle->ExecuteCommandL(
-        EPhoneViewUpdateBubble,
-        aCallId );
+    UpdateCallHeaderAndUiCommandsL( aCallId );
 
     SetToolbarButtonLoudspeakerEnabled();
-    UpdateUiCommands();
     }
 
 // -----------------------------------------------------------
@@ -364,13 +359,8 @@
 void CPhoneEmergency::HandleConnectedL( TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneEmergency::HandleConnectedL() ");
-    BeginUiUpdateLC();
-    iViewCommandHandle->ExecuteCommandL(
-        EPhoneViewUpdateBubble,
-        aCallId );
+    UpdateCallHeaderAndUiCommandsL( aCallId );
     SetBackButtonActive(ETrue);
-    UpdateUiCommands();
-    EndUiUpdate();
     }
 
 // --------------------------------------------------------------