diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonetwosingles.cpp
--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -297,9 +297,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
     
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneIncallButtons );
-    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -327,9 +325,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
     
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneIncallButtons );
-    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -363,11 +359,9 @@
         conferenceText, 
         callLabelId, 
         CCoeEnv::Static() );
-// <-- QT PHONE START --> 
     callHeaderParam.SetCLIText( conferenceText, TPhoneCmdParamCallHeaderData::ERight );
     
     callHeaderParam.SetCallState(EPEStateConnectedConference);
-// <-- QT PHONE END --> 
     BeginUiUpdateLC();
     
     callHeaderParam.SetCiphering(
@@ -434,9 +428,7 @@
     EndUiUpdate();
 
     // Go to incoming state
-// <-- QT PHONE START -->    
-    iCbaManager->SetCbaL( EPhoneCallHandlingIncomingSoftRejectCBA );
-// <-- QT PHONE END -->    
+    iCbaManager->SetCbaL( EPhoneCallHandlingIncomingRejectCBA );
     
     iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );        
     }