--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetup.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -206,8 +206,6 @@
     
     BeginUiUpdateLC();
     
-    UpdateRemoteInfoDataL ( aCallId );
-    
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
     
     // Re-enable global notes
@@ -218,8 +216,7 @@
 
     iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
 
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-    UpdateUiCommands();
+    UpdateCallHeaderAndUiCommandsL( aCallId );
     EndUiUpdate();
     
     // Go to alerting state
@@ -233,24 +230,15 @@
 void CPhoneSingleAndCallSetup::HandleConnectedL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
-        "CPhoneSingleAndCallSetup::HandleConnectedL()");
-    
-    BeginUiUpdateLC();
-    
-    // Show bubble
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
-    
+        "CPhoneSingleAndCallSetup::HandleConnectedL()");    
     // Remove the number entry if it isn't DTMF dialer
     if ( !iNumberEntryManager->IsNumberEntryVisibleL() )
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
         }
     
-    UpdateUiCommands();
+    UpdateCallHeaderAndUiCommandsL( aCallId );
     
-    EndUiUpdate();        
-    
-     // Go to two singles state
     iStateMachine->ChangeState( EPhoneStateTwoSingles );
     
     }