--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -59,8 +59,10 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-            &dtmfSendFlag );        
+// <-- QT PHONE START -->
+        iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
+            &dtmfSendFlag );
+// <-- QT PHONE END -->        
         }
     }
 
@@ -112,41 +114,25 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageConnecting:
-            {
             iAlerting = ETrue;
             HandleConnectingL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageConnected:
-            {
             HandleConnectedL( aCallId );
-            }
             break;
         
         case MEngineMonitor::EPEMessageConferenceIdle:
-            {
             HandleConferenceIdleL();
-            }
             break;
 
         case MEngineMonitor::EPEMessageIdle:
-            {
             HandleIdleL( aCallId );
-            }
             break;
-            
-        case MEngineMonitor::EPEMessageColpNumberAvailable:
-            {
-            HandleColpNoteL( aCallId );            
-            }
-            break;         
 
         default:
-            {
             CPhoneConference::HandlePhoneEngineMessageL( aMessage, 
                 aCallId );
-            }
             break;
         }
     }
@@ -337,6 +323,8 @@
         {
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
         }
+        
+    HandleColpNoteL( aCallId );
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );    
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );