--- a/emailservices/emailframework/inc/CFSMailPlugin.inl	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailframework/inc/CFSMailPlugin.inl	Wed Sep 01 12:28:57 2010 +0100
@@ -16,7 +16,7 @@
 */
 
 
-#include <ecom.h>
+#include <ecom/ecom.h>
 
 // -----------------------------------------------------------------------------
 // constructor
@@ -65,7 +65,6 @@
             aUid, _FOFF( CFSMailPlugin, iDtor_ID_Key ) ) );
     }
 
-// <cmail> empty implementations added to avoid CS warnings
 // -----------------------------------------------------------------------------
 // CFSMailPlugin::GetConnectionId
 // -----------------------------------------------------------------------------
@@ -76,7 +75,6 @@
     return KErrNotSupported;
     }
     
-    // <cmail> empty implementations added to avoid CS warnings
 // -----------------------------------------------------------------------------
 // CFSMailPlugin::IsConnectionAllowedWhenRoaming
 // -----------------------------------------------------------------------------
@@ -86,104 +84,5 @@
     {
     return KErrNotSupported;
     }
-// </cmail>
-
-// <qmail>
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::CreateMessageToSendL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::CreateMessageToSendL(
-    const TFSMailMsgId& /*aMailBoxId*/,
-    MFSMailRequestObserver& /*aOperationObserver*/,
-    const TInt /*aRequestId*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::CreateForwardMessageL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::CreateForwardMessageL( const TFSMailMsgId& /*aMailBoxId*/,
-    const TFSMailMsgId& /*aOriginalMessageId*/,
-    MFSMailRequestObserver& /*aOperationObserver*/,
-    const TInt /*aRequestId*/,
-    const TDesC& /*aHeaderDescriptor*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::CreateReplyMessageL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::CreateReplyMessageL( const TFSMailMsgId& /*aMailBoxId*/,
-    const TFSMailMsgId& /*aOriginalMessageId*/,
-    const TBool /*aReplyToAll*/,
-    MFSMailRequestObserver& /*aOperationObserver*/,
-    const TInt /*aRequestId*/,
-    const TDesC& /*aHeaderDescriptor*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::SendMessageL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::SendMessageL(
-        CFSMailMessage& /*aMessage*/,
-        MFSMailRequestObserver& /*aOperationObserver*/,
-        const TInt /*aRequestId*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::NewChildPartFromFileL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::NewChildPartFromFileL( const TFSMailMsgId& /*aMailBoxId*/,
-                                     const TFSMailMsgId& /*aParentFolderId*/,
-                                     const TFSMailMsgId& /*aMessageId*/,
-                                     const TFSMailMsgId& /*aParentPartId*/,
-                                     const TDesC& /*aContentType*/,
-                                     const TDesC& /*aFilePath*/,
-                                     MFSMailRequestObserver& /*aOperationObserver*/,
-                                     const TInt /*aRequestId*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::RemoveChildPartL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::RemoveChildPartL( const TFSMailMsgId& /*aMailBoxId*/,
-                               const TFSMailMsgId& /*aParentFolderId*/,
-                               const TFSMailMsgId& /*aMessageId*/,
-                               const TFSMailMsgId& /*aParentPartId*/,
-                               const TFSMailMsgId& /*aPartId*/,
-                               MFSMailRequestObserver& /*aOperationObserver*/,
-                               const TInt /*aRequestId*/)
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::DeleteMessagesByUidL
-// -----------------------------------------------------------------------------
-inline void CFSMailPlugin::DeleteMessagesByUidL( const TFSMailMsgId& /*aMailBoxId*/,
-                                   const TFSMailMsgId& /*aFolderId*/,
-                                   const RArray<TFSMailMsgId>& /*aMessages*/,
-                                   MFSMailRequestObserver& /*aOperationObserver*/,
-                                   const TInt /*aRequestId*/ )
-    {
-    User::Leave( KErrFSMailPluginNotSupported );
-    }
-// </qmail>
-
-// <qmail>
-// -----------------------------------------------------------------------------
-// CFSMailPlugin::GetSignatureL
-// -----------------------------------------------------------------------------
-inline HBufC* CFSMailPlugin::GetSignatureL( const TFSMailMsgId& /*aMailBoxId*/ )
-    {
-    return NULL;
-    }
-// </qmail>
+    
+// End of File