--- a/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp	Tue Feb 02 01:11:09 2010 +0200
+++ b/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp	Fri Mar 19 09:40:14 2010 +0200
@@ -18,18 +18,17 @@
 
 
 // INCLUDE FILES
-#include    "CaUiPlugin.h"  // This class interface.
-#include    "CaUiEng.h"     // CaUiEngine.
-#include    <AiwCommon.hrh> // AIW constants.
-#include    "CaUI.hrh"      // CallUI constants.
-#include    <AiwMenu.h>     // AIW Menu pane.
+#include    "cauiplugin.h" // This class interface. 
+#include    "cauieng.h" // CaUiEngine. 
+#include    <aiwcommon.hrh> // AIW constants. 
+#include    "caui.hrh" // CallUI constants. 
+#include    <aiwmenu.h> // AIW Menu pane. 
 
-#include	<AiwServiceHandler.h>
-#include    <PhCltTypes.h>  // PhoneClient types.
-#include    "CaUiLogger.h"  // Call Ui Logger
+#include    <aiwservicehandler.h> 
+#include    <phclttypes.h> // PhoneClient types. 
+#include    "cauilogger.h" // Call Ui Logger 
 #include    <stringloader.h>
-#include    <CallUI.rsg>
-#include    <featmgr.h>      // FeatureManager.
+#include    <callui.rsg>
 
 // CONSTANTS
 
@@ -247,13 +246,7 @@
                 }
             }
         }
-    
-    if ( csVideoMenuItemAvailable && 
-    		!FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) )
-    	{
-    	csVideoMenuItemAvailable = EFalse;
-    	}
-    
+
     // Add menu items
 
     TInt menuIndex = aIndex;