--- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -138,12 +138,9 @@
 
     if( callStateData.CallId() > KErrNotFound )
         {
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
-            callStateData.CallId() );
-        
         BringIncomingToForegroundL();       
         SetRingingTonePlaybackL( callStateData.CallId() );
-        UpdateUiCommands();
+        UpdateCallHeaderAndUiCommandsL( callStateData.CallId() );
         SetBackButtonActive(EFalse);
         iStateMachine->ChangeState( EPhoneStateIncoming );
         }
@@ -162,11 +159,7 @@
 void CPhoneCallSetupAndWaiting::HandleConnectedL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetupAndWaiting::HandleConnectedL() ");
-    BeginUiUpdateLC();
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-    
-    UpdateUiCommands();
-    EndUiUpdate();
+    UpdateCallHeaderAndUiCommandsL( aCallId );
     iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
     iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
     }