diff -r 7d48bed6ce0c -r 987c9837762f phoneclientserver/CallUI/Src/CaUiEngine/CaUiMessageSender.cpp
--- a/phoneclientserver/CallUI/Src/CaUiEngine/CaUiMessageSender.cpp	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/CallUI/Src/CaUiEngine/CaUiMessageSender.cpp	Wed Sep 01 12:15:03 2010 +0100
@@ -19,17 +19,17 @@
 
 
 //  INCLUDES
-#include    "cauimessagesender.h" 
+#include 	"CaUiMessageSender.h" 
 
-#include    <coemain.h>         // CCoeEnv
-#include    <callui.rsg> // Resources. 
+#include    <coemain.h>     	// CCoeEnv
+#include    <CallUI.rsg>  		// Resources.
 
-#include    <msvids.h>          // KUidMsvLocalServiceMtmValue
+#include    <msvids.h>    		// KUidMsvLocalServiceMtmValue
 
-#include    <sendui.h>          // CSendAppUi, CSendUi
-#include    <cmessagedata.h> // Message data for CSendUi 
-#include    <featmgr.h>         // Feature manager
-#include    "cauilogger.h" // Call Ui Logger 
+#include    <sendui.h>     		// CSendAppUi, CSendUi
+#include    <CMessageData.h>    // Message data for CSendUi
+#include    <featmgr.h>   		// Feature manager
+#include 	"cauilogger.h"		// Call Ui Logger
 
 // CONSTANTS
 // The reconnect query options granularity.
@@ -81,7 +81,7 @@
         
     if( iSendUi ) 
         {    
-        delete iSendUi;   
+    	delete iSendUi;   
         }
         
     CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::~CCaUiMessageSender()");    
@@ -100,9 +100,9 @@
     CAUILOGSTRING("CALLUI: >>> CCaUiMessageSender::NewL()");
     
     CCaUiMessageSender* self = new( ELeave ) CCaUiMessageSender ();
-    
-    CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::NewL()");
-    
+	
+	CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::NewL()");
+	
     return self;
     }
 
@@ -122,7 +122,7 @@
        
     TRAPD( err, CreateSendUiL());
     if ( err != KErrNone )
-        User::Leave( KErrGeneral );     
+	    User::Leave( KErrGeneral );		
     
     //Launch message editor standalone
     TUid mtmUid = { aMessageType };
@@ -201,7 +201,7 @@
     CleanupStack::Pop();
     iMsgTypes = msgTypes;
 
-    CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::MessageTypesArrayL()");
+	CAUILOGSTRING("CALLUI: <<< CCaUiMessageSender::MessageTypesArrayL()");
 
     return *iMsgTypes;
     }
@@ -332,7 +332,7 @@
             CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::HandleSessionEventL(): case: EMsvCloseSession");
             break;
         default:
-            CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::HandleSessionEventL(): case: default");
+        	CAUILOGSTRING("CALLUI:<<< CCaUiMessageSender::HandleSessionEventL(): case: default");
             break;
         }