--- a/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestateincoming.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -24,12 +24,9 @@
 #include <StringLoader.h>
 #include <dundomainpskeys.h>
 #include <telephonyvariant.hrh>
-#include <ScreensaverInternalPSKeys.h>
 #include <mpeengineinfo.h>
 #include <MediatorDomainUIDs.h>
-// <-- QT PHONE START -->
 #include <videotelcontrolmediatorapi.h>
-// <-- QT PHONE END -->
 
 #include "cphonepubsubproxy.h"
 #include "phoneui.pan"
@@ -409,6 +406,7 @@
 
     SetTouchPaneButtons( EPhoneIncallButtons );
     SetToolbarDimming( EFalse );
+    SetBackButtonActive(ETrue);
             
     EndUiUpdate();
     EndTransEffect();
@@ -482,7 +480,6 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
         &globalNotifierParam );
     
-
     SetDefaultFlagsL();
     
      if ( IsNumberEntryUsedL() )
@@ -517,6 +514,8 @@
         }
  
     DeleteTouchPaneButtons();
+    SetBackButtonActive(ETrue);
+    
     EndUiUpdate();
     EndTransEffect();
     // Go to idle state   
@@ -573,7 +572,7 @@
 
         case EPhoneCallComingCmdSoftReject:
             // Open Soft reject message editor
-            OpenSoftRejectMessageEditorL();
+            OpenSoftRejectMessageL();
             break;
 
         case EPhoneNumberAcqCmdSendCommand:
@@ -649,8 +648,6 @@
     if( IsVideoCall( iRingingCallId ) )
         {
         // Video call can be released only after we get response to VT Shutdown Command
-// <-- QT PHONE START -->
- 
         CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
                                                                              KCatPhoneToVideotelCommands, 
                                                                              EVtCmdReleaseDataport,
@@ -659,8 +656,6 @@
                                                                              KPhoneToVideotelCmdVersionBuild ),
                                                                    KNullDesC8,
                                                                    CPhoneReleaseCommand::NewL( *iStateMachine ) );
-
-// <-- QT PHONE END --> 
         }
     else
         {
@@ -676,7 +671,7 @@
 // CPhoneStateIncoming::OpenSoftRejectMessageEditorL
 // -----------------------------------------------------------
 //
-void CPhoneStateIncoming::OpenSoftRejectMessageEditorL()
+void CPhoneStateIncoming::OpenSoftRejectMessageL()
     {
     __LOGMETHODSTARTEND(EPhoneControl,
         "CPhoneStateIncoming::OpenSoftRejectMessageEditorL ()" );