diff -r 4e54af54a4a1 -r 6c59112cfd31 emailservices/nmclientapi/inc/nmapimessagemanager_p.h
--- a/emailservices/nmclientapi/inc/nmapimessagemanager_p.h	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/nmclientapi/inc/nmapimessagemanager_p.h	Thu Sep 30 11:43:07 2010 +0300
@@ -19,15 +19,14 @@
 #define NMAPIMESSAGEMANAGER_P_H_
 
 #include <QObject>
+#include <QPointer>
+
+#include <CFSMailCommon.h>
 #include <nmapimessagemanager.h>
-#include <nmapifolder.h>
-#include <nmapidatapluginfactory.h>
-#include <nmcommon.h>
-#include <nmapifolder.h>
-#include <nmapiprivateclasses.h>
 
-
-class NmApiEmailMessage;
+class NmApiEngine;
+class CFSMailBox;
+class CFSMailPlugin;
 
 namespace EmailClientApi
 {
@@ -39,42 +38,19 @@
     NmApiMessageManagerPrivate(QObject *parent,quint64 mailboxId);
     virtual ~NmApiMessageManagerPrivate();
     
+public slots: 
+    QPointer<NmApiOperation> createDraftMessage(const QVariant *initData);
+    QPointer<NmApiOperation> sendMessage(const NmApiMessage &message);
+    QPointer<NmApiOperation> saveMessage(const NmApiMessage &message);
+
 private:
-    enum EState {
-        EIdle = 0,
-        ECopyPending,
-        EMovePending,
-        EDeletePending        
-    };
-    
-public slots: 
-    bool moveMessages(const QList<quint64> messageIds,
-                    quint64 sourceFolderId,
-                    quint64 targetFolderId);
-
-    bool copyMessages(const QList<quint64> messageIds, 
-                   quint64 sourceFolder,
-                   quint64 targetFolder);
+    void initialise();
     
-	void messageEventHandler(NmMessageEvent event,
-								const NmId &folder,
-								const QList<NmId> &messages,
-								const NmId &mailBox);
-								
-signals:
-	void messagesCopied(int result);
-	void messagesCreated(int result);
-	void messagesMoved(int result);
-	void messagesDeleted(int result);
-
-
 private:    
-    NmApiMessageManagerPrivate::EState mState;
-    QList<quint64> mMessages;
-    NmId mTarget;
-    NmId mMailboxId; 
-    NmApiDataPluginFactory *mFactory;
-    QObject *mPlugin;
+    TFSMailMsgId mMailBoxId;
+    CFSMailBox *mMailBox;
+    CFSMailPlugin *mMailPlugin; //not owned
+    NmApiEngine *mEngine;
 };
 
 }