--- a/emailservices/emailframework/inc/CFSMailPluginManager.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/emailservices/emailframework/inc/CFSMailPluginManager.h	Fri Apr 16 14:51:52 2010 +0300
@@ -23,10 +23,11 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <ecom/ecom.h>
+#include <ecom.h>
 
+//<cmail>
 #include "CFSMailPlugin.h"
-
+//</cmail>
 #include "CFSMailRequestHandler.h"
 
 /** plugin configuration at start up */
@@ -44,7 +45,7 @@
  *  @lib FSFWCommonLib
  *  @since S60 v3.1
  */
-class CFSMailPluginManager : public CFSMailRequestHandler
+NONSHARABLE_CLASS ( CFSMailPluginManager ) : public CFSMailRequestHandler
 	{
 
 public: