diff -r ecc8def7944a -r 2dc6caa42ec3 emailservices/emailstore/base_plugin/inc/BasePlugin.h
--- a/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailstore/base_plugin/inc/BasePlugin.h	Fri May 14 15:41:10 2010 +0300
@@ -83,7 +83,9 @@
     friend class CDelayedDeleteMessagesOp;
     friend class CDelayedSetContentOp;
     friend class CDelayedMessageStorerOp;
-
+	// <qmail>
+    friend class CDelayedAddNewOrRemoveChildPartOp;
+	// </qmail>
 	protected:
     struct TOngoingFetchInfo;
     struct TCacheLine
@@ -293,6 +295,16 @@
         	const TFSMailMsgId& aMessageId,
             const TFSMailMsgId& aParentPartId,
             const TFSMailMsgId& aPartId );
+         // <qmail>
+         virtual void RemoveChildPartL(
+             const TFSMailMsgId& aMailBoxId,
+             const TFSMailMsgId& aParentFolderId,
+             const TFSMailMsgId& aMessageId,
+             const TFSMailMsgId& aParentPartId,
+             const TFSMailMsgId& aPartId,
+             MFSMailRequestObserver& aOperationObserver,
+             const TInt aRequestId );
+         // </qmail>
 
          virtual void SetPartContentFromFileL(
             const TFSMailMsgId& aMailBoxId,
@@ -420,7 +432,17 @@
 		    const TFSMailMsgId& aParentPartId,
 			const TDesC& aContentType,
 		    RFile& aFile );
-
+	     // <qmail>
+	     virtual void NewChildPartFromFileL(
+	         const TFSMailMsgId& aMailBoxId,
+	         const TFSMailMsgId& aParentFolderId,
+	         const TFSMailMsgId& aMessageId,
+	         const TFSMailMsgId& aParentPartId,
+	         const TDesC& aContentType,
+	         const TDesC& aFilePath, 
+	         MFSMailRequestObserver& aOperationObserver,
+	         const TInt aRequestId );
+	     // </qmail>
          virtual TInt WizardDataAvailableL();
 
          virtual void AuthenticateL(