--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -206,7 +206,7 @@
     else
         {
         // member of conference call which is on hold
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
+        UpdateCallHeader( aCallId );
         }   
     }
 
@@ -217,15 +217,9 @@
 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
+    UpdateCallHeaderAndUiCommandsL( aCallId ); 
+    iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue );
 
-    BeginUiUpdateLC();
-    UpdateRemoteInfoDataL ( aCallId );
-    
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-    
-    iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue );
-    UpdateUiCommands();
-    EndUiUpdate();
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );
     }
 
@@ -290,8 +284,7 @@
         case ENoActiveCalls: // Go to incoming state
             {           
             BringIncomingToForegroundL(); 
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, 
-                iRingingCallId );
+            UpdateCallHeaderAndUiCommandsL( iRingingCallId );
             
             if ( iNumberEntryManager->IsNumberEntryVisibleL() )
                 {
@@ -299,7 +292,6 @@
                 }
             
             SetRingingTonePlaybackL( iRingingCallId );
-            UpdateUiCommands();
             SetBackButtonActive(EFalse);
             iStateMachine->ChangeState( EPhoneStateIncoming );
             }