diff -r 2dc6caa42ec3 -r 9ba4404ef423 emailuis/nmailui/inc/nmattachmentmanager.h
--- a/emailuis/nmailui/inc/nmattachmentmanager.h	Fri May 14 15:41:10 2010 +0300
+++ b/emailuis/nmailui/inc/nmattachmentmanager.h	Thu May 27 12:43:55 2010 +0300
@@ -26,6 +26,7 @@
 class NmUiEngine;
 class NmOperation;
 class NmAttachmentFetchObserver;
+class NmMessage;
 
 class NmAttachmentManager : public QObject
 {
@@ -38,6 +39,15 @@
             const NmId &folderId, 
             const NmId &messageId, 
             const NmId &messagePartId);
+    void fetchAttachments(
+            const NmId &mailboxId, 
+            const NmId &folderId, 
+            const NmId &messageId,
+            QList<NmId> &messagePartIds);
+    void fetchAllMessageParts(
+            const NmId &mailboxId, 
+            const NmId &folderId, 
+            const NmId &messageId);
     bool isFetching() const;
     NmId partIdUnderFetch() const;
     int progressValue() const;
@@ -48,11 +58,14 @@
 private slots:
     void changeProgress(int value);
     void attachmentFetchCompleted(int result);
+    void messageFetched(int result);
     
 private:
     NmUiEngine &mUiEngine;
     QPointer<NmOperation> mFetchOperation;      // Not owned
+    QPointer<NmOperation> mMsgFetchOperation;      // Not owned
     NmAttachmentFetchObserver *mFetchObserver;  // Not owned
+    NmMessage *fetchMsg;
     NmId mAttaId;
     int mProgressValue;
     bool mIsFetching;