diff -r dcf0eedfc1a3 -r d189ee25cf9d emailservices/emailstore/base_plugin/inc/baseplugindelayedops.h
--- a/emailservices/emailstore/base_plugin/inc/baseplugindelayedops.h	Thu Aug 19 09:38:05 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/baseplugindelayedops.h	Tue Aug 31 15:04:17 2010 +0300
@@ -21,10 +21,13 @@
 
 
 #include <e32base.h>
-#include "cfsmailcommon.h"
-#include "baseplugin.h"
-#include "debuglogmacros.h"
+#include "CFSMailCommon.h"
+#include "BasePlugin.h"
+#include "DebugLogMacros.h"
 
+//<qmail>
+#include "baseplugindef.h"
+//</qmail>
 
 class CBasePlugin;
 class CDelayedOp;
@@ -68,46 +71,48 @@
  * The base class for the delayed operations. All of the delayed operations must
  * derive from it.
  */
-class CDelayedOp : public CActive
+class BASEPLUGIN_EXPORT CDelayedOp : public CActive
     {
 
 public:
-
-    IMPORT_C virtual ~CDelayedOp();
     
-    IMPORT_C void SetContext(
+     virtual ~CDelayedOp();
+    
+     void SetContext(
         CBasePlugin& aPlugin,
         MDelayedOpsManager& aManager );
-
-    IMPORT_C void StartOp();
-
+    
+	 void StartOp();
     /**
      * Derived classes must implement their asynchronous processing in this
      * method. The GetPlugin method can only be used from within this method.
-     * Returns boolean: ETrue if op is yielding and needs to be called again, or EFalse if op is done.
      */
     virtual TBool ExecuteOpL() = 0;
 
 protected:
     
-    IMPORT_C CDelayedOp();
+     CDelayedOp();
     
     /**
      * Returns the plugin instance associated with this operation. Available
      * only from within the ExecuteOpL method.
      */
-    IMPORT_C CBasePlugin& GetPlugin();
+     CBasePlugin& GetPlugin();
     
     
 private:
     
-    IMPORT_C virtual void RunL();
-    IMPORT_C virtual void DoCancel();
+     virtual void RunL();
+     virtual void DoCancel();
 
 private:
     MDelayedOpsManager* iManager;   //not owned
     CBasePlugin* iPlugin;           //not owned
     
+public:
+    TInt iRequestId;
+    MFSMailRequestObserver* iOperationObserver;
+    
     __LOG_DECLARATION
     };