diff -r 8592a65ad3fb -r b13141f05c3d emailservices/emailstore/base_plugin/inc/baseplugindelayedopsprivate.h
--- a/emailservices/emailstore/base_plugin/inc/baseplugindelayedopsprivate.h	Wed Apr 14 15:42:15 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/baseplugindelayedopsprivate.h	Tue Apr 27 16:20:14 2010 +0300
@@ -19,7 +19,7 @@
 
 
 #include "baseplugindelayedops.h"
-
+#include "NestedAO.h"
 
 /**
  * Lets the user enqueue and dequeue asynchronous jobs for handling
@@ -70,7 +70,7 @@
 /**
  * 
  */
-NONSHARABLE_CLASS( CDelayedDeleteMessagesOp ) : public CDelayedOp
+NONSHARABLE_CLASS( CDelayedDeleteMessagesOp ) : public CDelayedOp, public MDeletionHandler
     {
 
 public:
@@ -90,6 +90,10 @@
     //CDelayedOp::ExecuteOpL
     virtual void ExecuteOpL();
     
+    //From MDeletionHandler
+    //Used to delete messages in chunks starting from aStartIndex
+    TBool DeleteMessagesInChunksL( TInt aStartIndex );
+    
 private:
 
     void ConstructL( const RArray<TFSMailMsgId>& aMessages );
@@ -108,7 +112,7 @@
     TMsgStoreId iFolderId;
     RArray<TMsgStoreId> iMessages;
     TBool iImmediateDelete;
-    
+    TState iState;
     __LOG_DECLARATION
     };