diff -r d189ee25cf9d -r 3533d4323edc emailservices/emailclientapi/inc/emailmessage.h
--- a/emailservices/emailclientapi/inc/emailmessage.h	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailclientapi/inc/emailmessage.h	Wed Sep 01 12:28:57 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,10 +19,8 @@
 #define EMAILMESSAGE_H
 
 #include <memailmessage.h>
-#include "CFSMailCommon.h"
+#include "cfsmailcommon.h"
 #include "emailapiutils.h"
-#include "MFSMailRequestObserver.h"
-#include <QEventLoop>
 
 using namespace EmailInterface;
 
@@ -36,7 +34,7 @@
 class CEmailTextContent;
 class CEmailMultipart;
 
-NONSHARABLE_CLASS( CEmailMessage ) : public CBase, public MEmailMessage, public MFSMailRequestObserver
+NONSHARABLE_CLASS( CEmailMessage ) : public CBase, public MEmailMessage
     {
 public:
     /**
@@ -49,93 +47,89 @@
     ~CEmailMessage();
 
 public: // from MEmailInterface
-    TEmailTypeId InterfaceId() const;
-    
-    void Release();
+    virtual TEmailTypeId InterfaceId() const;
     
-public: // from MEmailMessage
-    /**@see MEmailMessage */
-    const TMessageId& MessageId() const;
+    virtual void Release();
+    
+public: // from MEmailAddress
+    virtual const TMessageId& MessageId() const;
     
     /**@see MEmailMessage */
-    MEmailAddress* SenderAddressL() const;
+    virtual MEmailAddress* SenderAddressL() const;
     
     /**@see MEmailMessage */
-    MEmailAddress* ReplyToAddressL() const;
+    virtual MEmailAddress* ReplyToAddressL() const;
     
     /**@see MEmailMessage */
-    void SetReplyToAddressL( const MEmailAddress& aSender );
+    virtual void SetReplyToAddressL( const MEmailAddress& aSender );
     
     /**@see MEmailMessage */
-    TInt GetRecipientsL( const MEmailAddress::TRole aRole,
+    virtual TInt GetRecipientsL( const MEmailAddress::TRole aRole,
         REmailAddressArray& aRecipients ) const;            
     
     /**@see MEmailMessage */
-    void SetRecipientsL( const MEmailAddress::TRole aRole, REmailAddressArray& aRecipients );
-    
-    /**@see MEmailMessage */
-    void RemoveRecipientL( const MEmailAddress& aRecipient );
+    virtual void SetRecipientsL( const MEmailAddress::TRole aRole, REmailAddressArray& aRecipients );
     
     /**@see MEmailMessage */
-    TPtrC Subject() const;
-
-    /**@see MEmailMessage */
-    void  SetSubjectL( const TPtrC& aSubject );    
+    virtual void RemoveRecipientL( const MEmailAddress& aRecipient );
     
     /**@see MEmailMessage */
-    TTime Date() const;
+    virtual TPtrC Subject() const;
 
     /**@see MEmailMessage */
-    TInt Flags() const;
-    
-    /**@see MEmailMessage */
-    void SetFlag( const TUint aFlag );
+    virtual void  SetSubjectL( const TPtrC& aSubject);    
     
     /**@see MEmailMessage */
-    void ResetFlag( const TUint aFlag );
+    virtual TTime Date() const;
 
     /**@see MEmailMessage */
-    MEmailMessageContent* ContentL() const;
+    virtual TInt Flags() const;
+    
+    /**@see MEmailMessage */
+    virtual void SetFlag( const TUint aFlag );
+    
+    /**@see MEmailMessage */
+    virtual void ResetFlag( const TUint aFlag );
 
     /**@see MEmailMessage */
-    void SetContentL( const MEmailMessageContent* aContent );
-    
-    /**@see MEmailMessage */
-    void SetPlainTextBodyL( const TDesC& aPlainText );
+    virtual MEmailMessageContent* ContentL() const;
 
     /**@see MEmailMessage */
-    MEmailAttachment* AddAttachmentL( const TDesC& aFullPath );
-    
-    /**@see MEmailMessage */
-    MEmailAttachment* AddAttachmentL( RFile& aFile );
+    virtual void SetContentL( const MEmailMessageContent* aContent );
     
     /**@see MEmailMessage */
-    TInt GetAttachmentsL( REmailAttachmentArray& aAttachments );
+    virtual void SetPlainTextBodyL( const TDesC& aPlainText );
+
+    /**@see MEmailMessage */
+    virtual MEmailAttachment* AddAttachmentL( const TDesC& aFullPath );
     
     /**@see MEmailMessage */
-    void RemoveAttachmentL( const MEmailAttachment& aAttachment );
-
+    virtual MEmailAttachment* AddAttachmentL( RFile& aFile );
+    
     /**@see MEmailMessage */
-    const TFolderId& ParentFolderId() const;
+    virtual TInt GetAttachmentsL( REmailAttachmentArray& aAttachments );
+    
+    /**@see MEmailMessage */
+    virtual void RemoveAttachmentL( const MEmailAttachment& aAttachment );
 
     /**@see MEmailMessage */
-    void SaveChangesL();
+    virtual const TFolderId& ParentFolderId() const;
 
     /**@see MEmailMessage */
-    void SendL();
+    virtual void SaveChangesL();
 
     /**@see MEmailMessage */
-    void ShowMessageViewerL();
+    virtual void SendL();
+
+    /**@see MEmailMessage */
+    virtual void ShowMessageViewerL();
     
     /**@see MEmailMessage */
-    void ReplyToMessageL( const TBool aReplyToAll = ETrue );
+    virtual void ReplyToMessageL( const TBool aReplyToAll = ETrue );
     
     /**@see MEmailMessage */
-    void ForwardMessageL();
+    virtual void ForwardMessageL();
     
-protected: // From MFSMailRequestObserver
-    void RequestResponseL( TFSProgress aEvent, TInt aRequestId );
-
 private:        
 
     // Copies/moves flag values from iPluginMessage's flags to local flag member variable
@@ -146,12 +140,10 @@
     void ConstructL();
 							       
     void ConvertAddressArrayL( const MEmailAddress::TRole aRole, 
-                               const RPointerArray<CFSMailAddress>& aSrc, 
+                               RPointerArray<CFSMailAddress>& aSrc, 
                                REmailAddressArray& aDst ) const; 
     CEmailAddress* CreateAddressLC( const MEmailAddress::TRole aRole, CFSMailAddress& aFsAddress ) const;
     TUint MapFlags( const TUint& aFlag );
-    
-    TMessageContentId MessageContentId( TEntryId aContentId ) const;
         
 private:
     CPluginData&    iPluginData;
@@ -176,8 +168,6 @@
     mutable CEmailMultipart* iContent;
     RPointerArray<CEmailAttachment> iAttachments;
     TDataOwner iOwner;
-    QEventLoop iEventLoop;
-    TInt iError;
 
     };
 //Class for compare email content type