--- a/emailuis/nmailuiengine/inc/nmdataplugininterface.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailuis/nmailuiengine/inc/nmdataplugininterface.h	Fri May 14 15:41:10 2010 +0300
@@ -19,12 +19,11 @@
 #define NMDATAPLUGININTERFACE_H_
 
 #include <QList>
-#ifdef Q_OS_SYMBIAN
+#include <QPointer>
 #include <xqsharablefile.h>
-#endif
+
 #include "nmcommon.h"
 
-
 class NmMailbox;
 class NmMessage;
 class NmMessagePart;
@@ -70,9 +69,9 @@
         NmMessage *&message) = 0;
 		
     virtual int getFolderById(
-            const NmId& mailboxId, 
-            const NmId& folderId, 
-            NmFolder*& folder ) = 0;
+        const NmId& mailboxId, 
+        const NmId& folderId, 
+        NmFolder*& folder ) = 0;
     
     virtual int listFolders(
         const NmId &mailboxId,
@@ -83,29 +82,34 @@
         const NmId &folderId,
         QList<NmMessageEnvelope*> &messageEnvelopeList) = 0;  
     
-virtual int listMessages(
+    virtual int listMessages(
         const NmId &mailboxId,
         const NmId &folderId,
         QList<NmMessageEnvelope*> &messageEnvelopeList, 
 		const int maxAmountOfEnvelopes ) = 0;
     
-    virtual NmOperation *fetchMessage( 
+    virtual int listMessages(
+        const NmId &mailboxId,
+        const NmId &folderId,
+        QList<NmMessage*> &messageList, 
+        const int maxAmountOfMessages = NmMaxItemsInMessageList) = 0;
+    
+    virtual QPointer<NmOperation> fetchMessage( 
         const NmId &mailboxId, 
         const NmId &folderId,
         const NmId &messageId ) = 0;
     
-    
-    virtual NmOperation *fetchMessagePart( 
+    virtual QPointer<NmOperation> fetchMessagePart( 
         const NmId &mailboxId,
         const NmId &folderId,
         const NmId &messageId,
         const NmId &messagePartId) = 0;
     
     virtual XQSharableFile messagePartFile(
-            const NmId &mailboxId,
-            const NmId &folderId,
-            const NmId &messageId,
-            const NmId &messagePartId) = 0;
+        const NmId &mailboxId,
+        const NmId &folderId,
+        const NmId &messageId,
+        const NmId &messagePartId) = 0;
     
     virtual NmId getStandardFolderId(
         const NmId &mailbox,
@@ -128,50 +132,55 @@
         const NmId &folderId,
         const QList<NmId> &messageIdList) = 0;
 
-    virtual NmStoreEnvelopesOperation *storeEnvelopes(
+    virtual QPointer<NmStoreEnvelopesOperation> storeEnvelopes(
         const NmId &mailboxId,
         const NmId &folderId,
         const QList<const NmMessageEnvelope*> &envelopeList) = 0;
 
-    virtual NmMessageCreationOperation *createNewMessage(const NmId &mailboxId) = 0;
+    virtual QPointer<NmMessageCreationOperation> createNewMessage(const NmId &mailboxId) = 0;
 
-    virtual NmMessageCreationOperation *createForwardMessage(
+    virtual QPointer<NmMessageCreationOperation> createForwardMessage(
         const NmId &mailboxId,
         const NmId &originalMessageId) = 0;
 
-    virtual NmMessageCreationOperation *createReplyMessage(
+    virtual QPointer<NmMessageCreationOperation> createReplyMessage(
         const NmId &mailboxId,
         const NmId &originalMessageId,
         const bool replyAll) = 0;
 
     virtual int saveMessage(const NmMessage &message) = 0;
 
-    virtual NmOperation *saveMessageWithSubparts(const NmMessage &message) = 0;
+    virtual QPointer<NmOperation> saveMessageWithSubparts(const NmMessage &message) = 0;
 
     virtual int removeMessage(
-                const NmId& mailboxId,
-                const NmId& folderId,
-                const NmId& messageId) = 0;
+        const NmId& mailboxId,
+        const NmId& folderId,
+        const NmId& messageId) = 0;
 
     virtual void subscribeMailboxEvents(const NmId& mailboxId) = 0;
     
     virtual void unsubscribeMailboxEvents(const NmId& mailboxId) = 0;
 
-    virtual NmMessageSendingOperation *sendMessage(NmMessage *message) = 0;
+    virtual QPointer<NmMessageSendingOperation> sendMessage(NmMessage *message) = 0;
     
-    virtual NmAddAttachmentsOperation *addAttachments(
-            const NmMessage &message,
-            const QList<QString> &fileList) = 0;
+    virtual QPointer<NmAddAttachmentsOperation> addAttachments(
+        const NmMessage &message,
+        const QList<QString> &fileList) = 0;
     
-    virtual NmOperation *removeAttachment(
-            const NmMessage &message,
-            const NmId &attachmentPartId) = 0;
+    virtual QPointer<NmOperation> removeAttachment(
+        const NmMessage &message,
+        const NmId &attachmentPartId) = 0;
 
-    virtual NmCheckOutboxOperation *checkOutbox(const NmId &mailboxId) = 0;
+    virtual QPointer<NmCheckOutboxOperation> checkOutbox(const NmId &mailboxId) = 0;
     
     virtual NmSyncState syncState(const NmId& mailboxId) const = 0;
     
     virtual NmConnectState connectionState(const NmId& mailboxId) const = 0;
+
+    virtual int search(const NmId &mailboxId,
+        const QStringList &searchStrings) = 0;
+
+    virtual int cancelSearch(const NmId &mailboxId) = 0;
 };
 
 Q_DECLARE_INTERFACE(NmDataPluginInterface, "sf.app.commonmail.emailuis.nmailuiengine.NmDataPluginInterface/1.0")