diff -r b13141f05c3d -r b5fbb9b25d57 emailservices/emailstore/base_plugin/inc/baseplugindelayedops.h
--- a/emailservices/emailstore/base_plugin/inc/baseplugindelayedops.h	Tue Apr 27 16:20:14 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/baseplugindelayedops.h	Tue May 11 15:57:15 2010 +0300
@@ -68,22 +68,25 @@
  * The base class for the delayed operations. All of the delayed operations must
  * derive from it.
  */
-class CDelayedOp : public CAsyncOneShot
+class CDelayedOp : public CActive
     {
 
 public:
-    
+
     IMPORT_C virtual ~CDelayedOp();
     
     IMPORT_C void SetContext(
         CBasePlugin& aPlugin,
         MDelayedOpsManager& aManager );
-    
+
+    IMPORT_C 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 void ExecuteOpL() = 0;
+    virtual TBool ExecuteOpL() = 0;
 
 protected: