diff -r f5907b1a1053 -r 0396474f30f5 emailservices/emailframework/inc/CFSClientAPIRequestHandler.h
--- a/emailservices/emailframework/inc/CFSClientAPIRequestHandler.h	Fri Mar 12 15:41:14 2010 +0200
+++ b/emailservices/emailframework/inc/CFSClientAPIRequestHandler.h	Mon Mar 15 12:39:10 2010 +0200
@@ -36,17 +36,16 @@
 	{
 
 public:
-  
+	
     /**
-     * destructor.
-     */
-     ~CFSClientAPIRequestHandler();
-
+    * To prevent deleting handler when is still needed
+    */
+    void ReleaseInstance();
+	
     /**
-     * two based constructor
-     *
-     */
-     static CFSClientAPIRequestHandler* NewL( MEmailClientPluginManager* aPluginManager);
+    * Returns instance of request handler
+    */
+    static CFSClientAPIRequestHandler* GetInstanceL( MEmailClientPluginManager* aPluginManager );
 	
     /**
      * returns plugin pointer related to plugin id
@@ -64,13 +63,26 @@
   	 CFSClientAPIRequestHandler(  MEmailClientPluginManager* aPluginManager );
   	 
     /**
-     * two based constructor
+     * two phased constructor
      */
      void ConstructL( );
 
+private: // methods
+     
+    /**
+    * destructor.
+    */
+    ~CFSClientAPIRequestHandler();
+	
+    /**
+    * two phased constructor
+    *
+    */
+    static CFSClientAPIRequestHandler* NewL( MEmailClientPluginManager* aPluginManager);
 
 private: // data
 
+    TInt iInstanceCounter;
     MEmailClientPluginManager* iPluginManager;
     };