diff -r ecc8def7944a -r 2dc6caa42ec3 emailuis/nmframeworkadapter/inc/nmfwaaddattachmentsoperation.h
--- a/emailuis/nmframeworkadapter/inc/nmfwaaddattachmentsoperation.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmframeworkadapter/inc/nmfwaaddattachmentsoperation.h	Fri May 14 15:41:10 2010 +0300
@@ -25,36 +25,34 @@
 
 class NmMessage;
 class CFSMailClient;
+class CFSMailMessage;
 
 class NmFwaAddAttachmentsOperation : public NmAddAttachmentsOperation,
                                      public MFSMailRequestObserver
 {
     Q_OBJECT
+    
 public:
     NmFwaAddAttachmentsOperation(const NmMessage &message,
                                  const QList<QString> &fileList,
                                  CFSMailClient &mailClient);
-    
-    virtual ~NmFwaAddAttachmentsOperation();
 
 public: // from MFSMailRequestObserver
-    virtual void RequestResponseL(TFSProgress aEvent, TInt aRequestId);
+    void RequestResponseL(TFSProgress aEvent, TInt aRequestId);
     
 protected:
-    virtual void doRunAsyncOperation();
-    virtual void doCancelOperation();
+    void doRunAsyncOperation();
+    void doCancelOperation();
 
 private:
+    ~NmFwaAddAttachmentsOperation();
     void doRunAsyncOperationL();	
 
 private:
-    const NmMessage &mMessage;
-
+    TInt mRequestId;
     QList<QString> mFileList;
-    
     CFSMailClient &mMailClient;
-    
-    QList<int> mRequestIds;
+    CFSMailMessage *mFSMessage;
 };
 
 #endif /* NMFWAADDATTACHMENTSOPERATION_H_ */