diff -r 139d4b7b2938 -r 99bcbff212ad emailuis/nmframeworkadapter/inc/nmframeworkadapter.h
--- a/emailuis/nmframeworkadapter/inc/nmframeworkadapter.h	Mon May 24 21:02:02 2010 +0300
+++ b/emailuis/nmframeworkadapter/inc/nmframeworkadapter.h	Fri May 28 13:56:43 2010 +0300
@@ -34,14 +34,15 @@
 class NmOperation;
 class NmMessageCreationOperation;
 class CFSMailClient;
+class CFSMailBox;
 class CFSMailFolder;
 class CFSMailMessage;
 class CFSMailMessagePart;
 class NmStoreEnvelopesOperation;
 class NmAddAttachmentsOperation;
-class NmCheckOutboxOperation;
 class NmMailboxSearchObserver;
 class NmMessageSendingOperation;
+class CEmailExtension;
 
 
 class NmFrameworkAdapter :
@@ -182,8 +183,6 @@
             const NmMessage &message, 
             const NmId &attachmentPartId);
 
-    QPointer<NmCheckOutboxOperation> checkOutbox(const NmId& mailboxId);
-    
     NmSyncState syncState(const NmId& mailboxId) const;
     
     NmConnectState connectionState(const NmId& mailboxId) const;
@@ -200,6 +199,8 @@
 
     void updateActiveFolder(const NmId &mailboxId, const NmId &folderId);
     
+    QPointer<NmOperation> removeDraftMessage(NmMessage *message);
+    
 signals:
 
     void mailboxEvent(NmMailboxEvent event, const QList<NmId> &mailboxIds);
@@ -291,12 +292,18 @@
             const NmId& mailboxId, 
             const NmId& folderId, 
             NmFolder*& unreadCount );
+    
+    void doUpdateActiveFolderL(const NmId &mailboxId, const NmId &folderId);
+    
+    CEmailExtension* getEMailStateExtensionL();      
 
 
 private: // Data
 
     CFSMailClient* mFSfw; // Singleton, not owned
     NmMailboxSearchObserver *mSearchObserver; // Owned
+    CFSMailBox* mCurrentMailBox; // Owned
+    CEmailExtension* mEmailExtension; // not owned
 };