--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -182,7 +182,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL");
     BeginUiUpdateLC();
-    UpdateRemoteInfoDataL ( aCallId );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
     
     TPhoneCmdParamBoolean globalNotifierParam;
@@ -190,11 +189,9 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
     
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+    UpdateCallHeaderAndUiCommandsL( aCallId );
         
     iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
-
-    UpdateUiCommands();
     EndUiUpdate();
     }
 
@@ -207,9 +204,8 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL");
     BeginUiUpdateLC();
-    UpdateRemoteInfoDataL ( aCallId );
-
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+    
+    UpdateCallHeader( aCallId );
     
     iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();