diff -r 011f79704660 -r cdd802add233 emailuis/nmailui/inc/nmattachmentmanager.h
--- a/emailuis/nmailui/inc/nmattachmentmanager.h	Fri Jun 11 16:23:29 2010 +0100
+++ b/emailuis/nmailui/inc/nmattachmentmanager.h	Thu Jul 22 16:30:28 2010 +0100
@@ -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);
+    bool 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;
@@ -47,12 +57,15 @@
     
 private slots:
     void changeProgress(int value);
-    void attachmentFetchCompleted(int result);
-    
+    void completeAttachmentFetch(int result);
+    void completeMessageFetch(int result);
+
 private:
     NmUiEngine &mUiEngine;
     QPointer<NmOperation> mFetchOperation;      // Not owned
+    QPointer<NmOperation> mMsgFetchOperation;      // Not owned
     NmAttachmentFetchObserver *mFetchObserver;  // Not owned
+    NmMessage *mFetchMsg;
     NmId mAttaId;
     int mProgressValue;
     bool mIsFetching;