--- a/emailservices/emailframework/inc/CFSMailPluginManager.h	Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPluginManager.h	Tue Aug 31 15:04:17 2010 +0300
@@ -23,11 +23,12 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <ecom/ecom.h>
+#include <ecom.h>
 
-#include "cfsmailplugin.h"
-
-#include "cfsmailrequesthandler.h"
+//<cmail>
+#include "CFSMailPlugin.h"
+//</cmail>
+#include "CFSMailRequestHandler.h"
 
 /** plugin configuration at start up */
 enum TFsFwConfiguration
@@ -44,7 +45,7 @@
  *  @lib FSFWCommonLib
  *  @since S60 v3.1
  */
-class CFSMailPluginManager : public CFSMailRequestHandler
+NONSHARABLE_CLASS ( CFSMailPluginManager ) : public CFSMailRequestHandler
 	{
 
 public:
@@ -108,13 +109,7 @@
      */  
 	 void ListImplementationsL( RPointerArray<CFSMailPlugin>& aImplementations,
 	                            RPointerArray<CImplementationInformation>& aInfo );
-	
-     /**
-      * recheck existing plugins
-      *
-      */                 								 
-     void CFSMailPluginManager::RecheckPlugins( );
-     
+									 
 protected:
 
     /**