--- a/emailservices/emailstore/base_plugin/src/basepluginparts.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/basepluginparts.cpp	Wed Sep 01 12:28:57 2010 +0100
@@ -14,7 +14,7 @@
 * Description:   Multi-part support.
 *
 */
-#include "BasePlugin.h"
+#include "baseplugin.h"
 #include "baseplugincommonutils.h"
 #include "baseplugindelayedopsprivate.h"
 
@@ -107,28 +107,6 @@
     CleanupStack::PopAndDestroy( message );
     }
 
-// <qmail>
-/**
- *
- */
-EXPORT_C void CBasePlugin::RemoveChildPartL(
-    const TFSMailMsgId&  aMailBoxId ,
-    const TFSMailMsgId&  aParentFolderId ,
-    const TFSMailMsgId&  aMessageId,
-    const TFSMailMsgId&  aParentPartId ,
-    const TFSMailMsgId&  aPartId,
-    MFSMailRequestObserver& aOperationObserver,
-    const TInt aRequestId )
-    {
-    //Asynchronous operation to remove child part.
-    //CDelayedAddNewOrRemoveChildPartOp::ExecuteOpL will eventually delete childpart 
-    CDelayedAddNewOrRemoveChildPartOp* op = CDelayedAddNewOrRemoveChildPartOp::NewLC(
-            aMailBoxId, aParentFolderId , aMessageId, aParentPartId,  aPartId,
-            aOperationObserver, aRequestId);
-    iDelayedOpsManager->EnqueueOpL( op );
-    CleanupStack::Pop( op );
-    }
-// </qmail>
 
 /**
  *
@@ -454,31 +432,6 @@
     } //NewChildPartFromFileL.
 
 
-// <qmail>
-/**
- *
- */
-EXPORT_C void CBasePlugin::NewChildPartFromFileL(
-    const TFSMailMsgId& aMailBoxId,
-    const TFSMailMsgId& aParentFolderId ,
-    const TFSMailMsgId& aMessageId,
-    const TFSMailMsgId& aParentPartId ,
-    const TDesC& aContentType,
-    const TDesC& aFilePath,
-    MFSMailRequestObserver& aOperationObserver,
-    const TInt aRequestId )
-    {
-    //Asynchronous operation to add child part.
-    //CDelayedAddNewOrRemoveChildPartOp::ExecuteOpL will eventually add childpart 
-    CDelayedAddNewOrRemoveChildPartOp* op = CDelayedAddNewOrRemoveChildPartOp::NewLC(
-            aMailBoxId, aParentFolderId , aMessageId, aParentPartId,  aContentType,
-            aFilePath, aOperationObserver, aRequestId);
-    iDelayedOpsManager->EnqueueOpL( op );
-    CleanupStack::Pop( op );
-
-    }
-
-// </qmail> 
 /**
  *
  */