--- a/email_plat/email_services_api/email_services_api.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/email_services_api/email_services_api.h	Fri May 14 15:41:10 2010 +0300
@@ -26,12 +26,21 @@
 static const QString emailSendCcKey = "cc";
 static const QString emailSendBccKey = "bcc";
 
+/*!
+    Mail service name
+*/
+static const QString emailServiceName("nmail");
 
 /*!
     Mail send service interface name.
 */
 static const QString emailInterfaceNameSend = "com.nokia.symbian.IEmailMessageSend";
 
+/*!
+    Mail send service interface name.
+*/
+static const QString emailFullServiceNameSend = emailServiceName + "." + emailInterfaceNameSend;
+
 
 /*!
     \fn send(QVariant data)
@@ -55,7 +64,7 @@
 
         bool syncronous;
 
-        XQServiceRequest request(emailInterfaceNameSend,
+        XQServiceRequest request(emailFullServiceNameSend,
                                  emailOperationSendMail,
                                  syncronous);
 
@@ -84,12 +93,22 @@
 */
 static const QString emailInterfaceNameMailbox = "com.nokia.symbian.IEmailInboxView";
 
+/*!
+    Mailbox service full name.
+*/
+static const QString emailFullServiceNameMailbox = emailServiceName + "." + emailInterfaceNameMailbox;
+
 
 /*!
     Message service interface name.
 */
 static const QString emailInterfaceNameMessage = "com.nokia.symbian.IEmailMessageView";
 
+/*!
+    Message service full name.
+*/
+static const QString emailFullServiceNameMessage = emailServiceName + "." + emailInterfaceNameMessage;
+
 
 /*!
     \fn displayInboxByMailboxId(QVariant data)
@@ -102,7 +121,7 @@
     Usage example:
 
     XQServiceRequest request(
-        emailInterfaceNameMailbox,
+        emailFullServiceNameMailbox,
         emailOperationViewInbox,
         syncronous);
 
@@ -129,7 +148,7 @@
     Usage example:
 
     XQServiceRequest request(
-       emailInterfaceNameMessage,
+       emailFullServiceNameMessage,
        emailOperationViewMessage,
        syncronous);
 

--- a/email_plat/nmail_client_api/nmail_client_api.pri	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmail_client_api.pri	Fri May 14 15:41:10 2010 +0300
@@ -18,10 +18,10 @@
 symbian*: {
     # Build.inf rules
     BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
-            "nmail_client_api/nmcommon_api.h           APP_LAYER_PLATFORM_EXPORT_PATH(nmcommon_api.h)" \
+            "nmail_client_api/nmapicommon.h            APP_LAYER_PLATFORM_EXPORT_PATH(nmapicommon.h)" \
             "nmail_client_api/nmapiemailaddress.h      APP_LAYER_PLATFORM_EXPORT_PATH(nmapiemailaddress.h)" \
             "nmail_client_api/nmapiemailservice.h      APP_LAYER_PLATFORM_EXPORT_PATH(nmapiemailservice.h)" \
-            "nmail_client_api/nmenginedef.h            APP_LAYER_PLATFORM_EXPORT_PATH(nmenginedef.h)" \
+            "nmail_client_api/nmapidef.h               APP_LAYER_PLATFORM_EXPORT_PATH(nmapidef.h)" \
             "nmail_client_api/nmapienvelopelisting.h   APP_LAYER_PLATFORM_EXPORT_PATH(nmapienvelopelisting.h)" \
             "nmail_client_api/nmapieventnotifier.h     APP_LAYER_PLATFORM_EXPORT_PATH(nmapieventnotifier.h)" \
             "nmail_client_api/nmapifolder.h            APP_LAYER_PLATFORM_EXPORT_PATH(nmapifolder.h)" \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_plat/nmail_client_api/nmapicommon.h	Fri May 14 15:41:10 2010 +0300
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef NMAPICOMMON_H_
+#define NMAPICOMMON_H_
+
+#include <QMetaType>
+
+namespace EmailClientApi
+{
+    /*!
+       Enum to describe mailbox events
+     */
+    enum NmApiMailboxEvent
+    {
+        MailboxCreated, MailboxDeleted
+    };
+    
+    /*!
+       Enum to describe message events.
+     */
+    enum NmApiMessageEvent 
+    {
+        MessageCreated,
+        MessageDeleted,
+        MessageChanged
+    };
+    
+    /*!
+       Enum to describe type of email folder 
+     */
+    enum NmApiEmailFolderType
+    {
+        Inbox, Drafts, Outbox, Sent, Deleted, EOther
+    };
+    
+    /*!
+       Enum to describe error types
+     */
+    enum NmApiError
+    {
+        GeneralError = -1, NotSupportedError
+    };
+    
+}
+Q_DECLARE_METATYPE (EmailClientApi::NmApiMailboxEvent)
+Q_DECLARE_METATYPE(EmailClientApi::NmApiMessageEvent)
+Q_DECLARE_METATYPE (EmailClientApi::NmApiEmailFolderType)
+Q_DECLARE_METATYPE (EmailClientApi::NmApiError)
+
+#endif /* NMAPICOMMON_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email_plat/nmail_client_api/nmapidef.h	Fri May 14 15:41:10 2010 +0300
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef NMAPIENGINEDEF_H_
+#define NMAPIENGINEDEF_H_
+
+#include <QtGlobal>
+
+#if defined(Q_OS_WIN)
+#define NMAPI_EXPORT __declspec(dllexport)
+#else
+
+#if defined(BUILD_EMAIL_API_DLL)
+#define NMAPI_EXPORT Q_DECL_EXPORT
+#else
+#define NMAPI_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif
+
+#endif /* NMAPIENGINEDEF_H_ */

--- a/email_plat/nmail_client_api/nmapiemailaddress.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapiemailaddress.h	Fri May 14 15:41:10 2010 +0300
@@ -18,53 +18,64 @@
 #ifndef NMAPIEMAILADDRESS_H
 #define NMAPIEMAILADDRESS_H
 
-#include <QString>
 #include <QExplicitlySharedDataPointer>
-#include "nmenginedef.h"
-/**
- * Email addres
+#include <nmapidef.h>
+/*!
+   Email addres
  */
 
+class QString;
+
 namespace EmailClientApi
 {
-class NmEmailAddressPrivate : public QSharedData
+
+class NmApiEmailAddressPrivate;
+
+class NMAPI_EXPORT NmApiEmailAddress
 {
 public:
-    NmEmailAddressPrivate();
-    virtual ~NmEmailAddressPrivate();
-    QString displayName;
-    QString address;
-};
+    /*!
+       Constructor for NmApiEmailAddress class
+     */
+    NmApiEmailAddress();
+    virtual ~NmApiEmailAddress();
+
+    /*!
+       copying constructor for nmmessageenvelope
+     */
+    NmApiEmailAddress(const NmApiEmailAddress &addr);
 
-class NMENGINE_EXPORT NmEmailAddress
-{
-public:
+    /*!
+       Assignment operator
+     */
+    NmApiEmailAddress &operator=(const NmApiEmailAddress &addr);
+
+    /*!
+       Compares data from \a addr
+     */
+    bool operator==(const NmApiEmailAddress &addr);
+
     /*
-     * Constructor for NmEmailAddress class
-     */
-    NmEmailAddress();
-    virtual ~NmEmailAddress();
-    /*
-     * getter for displayname
+       getter for displayname
      */
     QString displayName() const;
 
-    /*
-     * getter for address
+    /*!
+       getter for address
      */
     QString address() const;
 
-    /*
-     * setter for displayname 
+    /*!
+       setter for displayname 
      */
     void setDisplayName(const QString &displayName);
 
-    /*
-     * setter for address
+    /*!
+       setter for address
      */
     void setAddress(const QString &address);
 private:
-    QExplicitlySharedDataPointer<NmEmailAddressPrivate> d;
+    QExplicitlySharedDataPointer<NmApiEmailAddressPrivate> d;
 };
 }
 

--- a/email_plat/nmail_client_api/nmapiemailservice.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapiemailservice.h	Fri May 14 15:41:10 2010 +0300
@@ -18,71 +18,75 @@
 #ifndef NMAPIEMAILSERVICE_H
 #define NMAPIEMAILSERVICE_H
 
+#include <nmapidef.h>
 #include <QObject>
 
-#include "nmenginedef.h"
-#include "nmapimailbox.h"
-#include "nmapimessageenvelope.h"
+class NmApiEngine;
 
-class NmEngine;
-
-/**
- * Client that wants to access mailboxes, messages and receive related events
- * use this class as "entry point". 
+/*!
+   Client that wants to access mailboxes, messages and receive related events
+   use this class as "entry point". 
  */
 
 namespace EmailClientApi
 {
-class NMENGINE_EXPORT NmEmailService : public QObject
+
+class NmApiMessageEnvelope;
+class NmApiMailbox;
+
+class NMAPI_EXPORT NmApiEmailService : public QObject
 {
     Q_OBJECT
 public:
 
-    /*
-     * constructor for NmEmailService
+    /*!
+       constructor for NmApiEmailService
      */
-    NmEmailService(QObject* parent);
+    NmApiEmailService(QObject* parent);
 
-    /*
-     * destructor for NmEmailService
+    /*!
+       destructor for NmApiEmailService
      */
-    virtual ~NmEmailService();
+    virtual ~NmApiEmailService();
 
-    /*
-     * Initialises email service. this must be called and initialised signal received 
-     * before services of the library are used.
+    /*!
+       Initialises email service. this must be called and initialised signal received 
+       before services of the library are used.
      */
     void initialise();
 
-    /*
-     *  frees resources.
+    /*!
+        frees resources.
      */
     void uninitialise();
 
-    /*
-     *gets mail message envelope by id (see also NmEventNotifier)
+    /*!
+       gets mail message envelope by id (see also NmApiEventNotifier)
      */
-    bool getEnvelope( const quint64 mailboxId, const quint64 folderId, const quint64 envelopeId, NmMessageEnvelope &envelope );
+    bool getEnvelope(const quint64 mailboxId, 
+                     const quint64 folderId, 
+                     const quint64 envelopeId, 
+                     EmailClientApi::NmApiMessageEnvelope &envelope);
 
-    /*
-     *  gets mailbox info by id (see also NmEventNotifier)
+    /*!
+        gets mailbox info by id (see also NmApiEventNotifier)
      */
-    bool getMailbox( const quint64 mailboxId, NmMailbox &mailboxInfo );
+    bool getMailbox(const quint64 mailboxId, EmailClientApi::NmApiMailbox &mailboxInfo);
 
-    /*
-     * returns isrunning flag value
+    /*!
+       returns isrunning flag value
      */
     bool isRunning() const;
     signals:
-    /*
-     * this signal is emitted when initialisation is completed
-     * boolean argument tells if initialisation succeeded
+    /*!
+       this signal is emitted when initialisation is completed
+       boolean argument tells if initialisation succeeded
      */
     void initialized(bool);
 
 private:
-    NmEngine* mEngine;
+    NmApiEngine *mEngine;
     bool mIsRunning;
 };
 }
-#endif /* NMEMAILSERVICE_H_ */
+#endif /* NMAPIEMAILSERVICE_H */

--- a/email_plat/nmail_client_api/nmapienvelopelisting.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapienvelopelisting.h	Fri May 14 15:41:10 2010 +0300
@@ -18,86 +18,88 @@
 #ifndef NMAPIENVELOPELISTING_H_
 #define NMAPIENVELOPELISTING_H_
 
-#include <QObject>
 #include <QList>
 
-#include "nmapimessagetask.h"
-#include "nmapimessageenvelope.h"
-#include "nmenginedef.h"
+#include <nmapimessagetask.h>
+#include <nmapidef.h>
 
-class NmEngine;
+class QObject;
+
+class NmApiEngine;
 
 // list messages in particular folder.
 namespace EmailClientApi
 {
-class NmEnvelopeListingPrivate;
+class NmApiEnvelopeListingPrivate;
+class NmApiMessageEnvelope;
 
-class NMENGINE_EXPORT NmEnvelopeListing : public NmMessageTask
+class NMAPI_EXPORT NmApiEnvelopeListing : public NmApiMessageTask
 {
     Q_OBJECT
 public:
     /*!
-     * Constructor of class. It set start values.
+       Constructor of class. It set start values.
      */
-    NmEnvelopeListing( QObject *parent, const quint64 folderId, const quint64 mailboxId );
+    NmApiEnvelopeListing(QObject *parent, const quint64 folderId, const quint64 mailboxId);
 
     /*!
-     * Destructor of class. It release engine to be safe if manual releasing won't work.
+       Destructor of class. It release engine to be safe if manual releasing won't work.
      */
-    virtual ~NmEnvelopeListing();
+    ~NmApiEnvelopeListing();
 
     enum {EnvelopeListingFailed = -1};
 
     /*! 
-     * \brief Returns results after envelopesListed signal is received.
-     * 
-     *  Caller gets ownership of envelopes. Returns true if results were available.
-     *  It clears list of envelopes after be called.
-     *  It also at start clear inputlist of NmMessageEnvelope.
-     *  
-     *  \arg envelopes 
+       \brief Returns results after envelopesListed signal is received.
+       
+        Caller gets ownership of envelopes. Returns true if results were available.
+        Before calling this method, cancel and start should be called, 
+        because after second call it returns empty list.
+        It also at start clear inputlist of NmApiMessageEnvelope.
+        
+        \param envelopes envelopes
      */
-    bool getEnvelopes( QList<EmailClientApi::NmMessageEnvelope> &envelopes );
+    bool getEnvelopes(QList<EmailClientApi::NmApiMessageEnvelope> &envelopes);
 
     /*!
-     * \brief Return info if listing is running
+       \brief Return info if listing is running
      */
     bool isRunning() const;
     signals:
     /*!
-     * Emitted when listing is available, count is number of mailboxes found
-     * or EnvelopeListingFailed if listing failed
+       Emitted when listing is available, count is number of envelopes found
+       or EnvelopeListingFailed if listing failed
      */
     void envelopesListed(qint32 count);
 
 public slots:
     /*!
-     * \brief Starts gathering envelopes list.
-     * 
-     * In first turn it will get whole folderlist. 
-     * If start works, it do nothing.
-     * 
-     * To asynchronous operation ce be used \sa QTimer::singleShot on this method.
-     * Example:
-     * <code> 
-     * QTimer::singleShot(0,nmEnvelopeListing,SLOT(start());
-     * </code>
-     * 
+       \brief Starts gathering envelopes list.
+       
+       In first turn it will get whole folderlist. 
+       If start works, it do nothing.
+       
+       To asynchronous operation ce be used \sa QTimer::singleShot on this method.
+       Example:
+       \code
+       QTimer::singleShot(0,nmEnvelopeListing,SLOT(start());
+       \endcode
+       
      */
-    virtual bool start();
+    bool start();
 
     /*!
-     * \brief Stop gathering envelope list.
-     * 
-     * In first it change state of listing.
-     * Then it release engine.
-     * On end it clears list of envelopes and emits \sa NmMessageTask::canceled() signal.
+       \brief Stop gathering envelope list.
+       
+       In first it change state of listing.
+       Then it release engine.
+       On end it clears list of envelopes and emits \sa NmApiMessageTask::canceled() signal.
      */
-    virtual void cancel();
+    void cancel();
 
 private:
-    NmEnvelopeListingPrivate* mListingPrivate;
+    NmApiEnvelopeListingPrivate *mListingPrivate;
 };
 }
 
-#endif /* NMENVELOPELISTING_H_ */
+#endif /* NMAPIENVELOPELISTING_H_ */

--- a/email_plat/nmail_client_api/nmapieventnotifier.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapieventnotifier.h	Fri May 14 15:41:10 2010 +0300
@@ -18,102 +18,104 @@
 #ifndef NMAPIEVENTNOTIFIER_H
 #define NMAPIEVENTNOTIFIER_H
 
-#include <QtCore>
-#include "nmapimessagetask.h"
-#include "nmenginedef.h"
-#include "nmcommon_api.h"
+#include <nmapimessagetask.h>
+#include <nmapidef.h>
+#include <nmapicommon.h>
 
 struct NmApiMessage;
 
 namespace EmailClientApi
 {
-class NmEventNotifierPrivate;
+class NmApiEventNotifierPrivate;
 
-/*
- * Notifier for mailbox and message events
- * 
- * Example of use:
- * NmEventNotifier *notifier = new NmEventNotifier(this);
- * notifier->start();
- * connect(notifier,SIGNAL(messageEvent(MessageEvent,quint64,quint64,QList<quint64>)),this,
- *                  SLOT(processMessage(MessageEvent,quint64,quint64,QList<quint64>)),Qt::QueuedConnection);
- * 
- * And then when want to end need to do:
- * notifier->cancel();
- * delete notifier; // or notifier->deleteLater();
+/*!
+   Notifier for mailbox and message events
+   
+   Example of use:
+   \code
+   NmApiEventNotifier *notifier = new NmApiEventNotifier(this);
+   notifier->start();
+   connect(notifier,SIGNAL(messageEvent(MessageEvent,quint64,quint64,QList<quint64>)),this,
+                    SLOT(processMessage(MessageEvent,quint64,quint64,QList<quint64>)),Qt::QueuedConnection);
+   \endcode
+   And then when want to end need to do:
+   \code
+   notifier->cancel();
+   delete notifier; // or notifier->deleteLater();
+   \endcode
  */
-class NMENGINE_EXPORT NmEventNotifier : public NmMessageTask
+class NMAPI_EXPORT NmApiEventNotifier : public NmApiMessageTask
 {
     Q_OBJECT
 public:
     /*!
-     * Constructor
+       Constructor
      */
-    NmEventNotifier(QObject *parent);
+    NmApiEventNotifier(QObject *parent);
 
     /*!
-     * Destructor
+       Destructor
      */
-    virtual ~NmEventNotifier();
+    virtual ~NmApiEventNotifier();
 
     /*!
-     * Start monitoring email events
-     * 
-     * Return value tells about monitoring system running
+       Start monitoring email events
+       
+       Return value informs if monitoring system is up
      */
     virtual bool start();
 
     /*!
-     * Cancels monitoring.
-     * 
-     * In user responsibility is to cancel monitoring.
-     * On end it clear buffer events and emits \sa NmMessageTask::canceled() signal.
+       Cancels monitoring.
+       
+       In user responsibility is to cancel monitoring.
+       On end it clear buffer events and emits \sa NmApiMessageTask::canceled() signal.
      */
     virtual void cancel();
 
     /*!
-     * It check if if event notifier is running.
+       Checks if event notifier is running.
      */
     bool isRunning() const;
 
     signals:
     /*!
-     * This signal is emited when buffer of maiblox events is ready to send. Buffer is list of mailbox events with id.
-     * 
-     * 
-     * It emits signals grouped by events. So there will be as much signals as much there are events.
-     * For safety when connect it need to use \sa Qt::QueuedConnection.
-     * After that use \sa EmailClientApi::NmEmailService::getMailbox to get object.
-     * \arg Event of mailbox
-     * \arg List of mailbox ids where event occur.
+       This signal is emited when buffer of mailbox events is ready to send. Buffer is list of mailbox events with id.
+       
+       
+       It emits signals grouped by events. So there will be as much signals as much there are events.
+       For safety when connect it need to use \sa Qt::QueuedConnection.
+       After that use \sa EmailClientApi::NmEmailService::getMailbox to get object.
+       \param event Event of mailbox
+       \param id List of mailbox ids where event occur.
      */
-    void mailboxEvent(MailboxEvent event,QList<quint64> id);
+    void mailboxEvent(EmailClientApi::NmApiMailboxEvent event, QList<quint64> id);
 
     /*!
-     * This signal is emited when buffer of messages events is ready to send. Buffer is list of messages events with id.
+       This signal is emited when buffer of messages events is ready to send. Buffer is list of messages events with id.
      *
-     * It emits signals grouped by events, mailbox and folder. So there will be as much signals as much there are events.
-     * For safety when connect it need to use \sa Qt::QueuedConnection.
-     * After that use \sa EmailClientApi::NmEmailService::getEnvelope to get object.
-     * 
-     * \arg Event of messages
-     * \arg Message mailbox
-     * \arg Message folder
-     * \arg List of messages ids where event occur
+       It emits signals grouped by events, mailbox and folder. So there will be as much signals as much there are events.
+       For safety when connect it need to use \sa Qt::QueuedConnection.
+       After that use \sa EmailClientApi::NmApiEmailService::getEnvelope to get object.
+       
+       \param event Event of messages
+       \param mailboxId Message mailbox
+       \param folderId Message folder
+       \param envelopeIdList List of messages ids where event occur
      */
-    void messageEvent(MessageEvent event,quint64 mailboxId,quint64 folderId,QList<quint64> envelopeIdList);
+    void messageEvent(EmailClientApi::NmApiMessageEvent event, quint64 mailboxId, quint64 folderId, QList<quint64> envelopeIdList);
 
 public slots:
     /*!
-     * It check each object in buffer and emit signal with it.
-     * 
-     * After end of work of this function buffer is empty.
-     * It is called by timeout signal from timer.
+       It check each object in buffer and emit signal with it.
+       
+       After end of work of this function buffer is empty.
+       It is called by timeout signal from timer.
      */
     void sendEventsFromBuffer();
 
 private:
-    NmEventNotifierPrivate *mNmEventNotifierPrivate;
+    NmApiEventNotifierPrivate *mNmApiEventNotifierPrivate;
 };
 
 }

--- a/email_plat/nmail_client_api/nmapifolder.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapifolder.h	Fri May 14 15:41:10 2010 +0300
@@ -18,106 +18,101 @@
 #ifndef NMAPIFOLDERINFO_H
 #define NMAPIFOLDERINFO_H
 
-#include <QString>
 #include <QExplicitlySharedDataPointer>
 #include <QList>
-#include "nmenginedef.h"
+#include <nmapidef.h>
+#include <nmapicommon.h>
 
-/**
- * Mailbox metadata class
+/*!
+   Mailbox metadata class
  */
 namespace EmailClientApi
 {
 
-enum EmailFolderType
-{
-    Inbox, Drafts, Outbox, Sent, Deleted, EOther
-};
+class NmApiFolderPrivate;
 
-enum
-{
-    GeneralError = -1, NotSupportedError
-};
-
-class NmFolderPrivate : public QSharedData
+class NMAPI_EXPORT NmApiFolder
 {
 public:
-    NmFolderPrivate();
-    virtual ~NmFolderPrivate();
-
-    quint64 id;
-    QString name;
-    EmailFolderType folderType;
-    quint64 parentId;
-    QList<quint64> childFolderIds;
-};
+    /*!
+       constructor for NmApiFolder class
+     */
+    NmApiFolder();
+    
+    /*!
+        Copy constructor for NmApiFolder 
+     */
+    NmApiFolder(const NmApiFolder &nmApiFolder);
+    
+    /*!
+       destructor for NmApiFolder class
+     */
+    virtual ~NmApiFolder();
 
-class NMENGINE_EXPORT NmFolder
-{
-public:
-    /*
-     * constructor for NmFolder class
+    /*!
+       Assigns data from \a folder
      */
-    NmFolder();
-    /*
-     * destructor for NmFolder class
+    NmApiFolder &operator=(const NmApiFolder &folder);
+    
+    /*!
+       Compares data from \a folder
      */
-    ~NmFolder();
-
-    /*
-     * getter for id
+    bool operator==(const NmApiFolder &folder);
+    
+    /*!
+       getter for id
      */
     quint64 id() const;
 
-    /*
-     * getter for name 
+    /*!
+       getter for name 
      */
     QString name() const;
 
-    /*
-     * getter for foldertype
+    /*!
+       getter for foldertype
      */
-    EmailFolderType folderType() const;
+    EmailClientApi::NmApiEmailFolderType folderType() const;
 
-    /*
-     * setter for id
+    /*!
+       setter for id
      */
     void setId(quint64 id);
 
-    /*
-     * setter for name
+    /*!
+       setter for name
      */
-    void setName(const QString& name);
+    void setName(const QString &name);
 
-    /*
-     * setter for foldertype
+    /*!
+       setter for foldertype
      */
-    void setFolderType(EmailFolderType folderType);
+    void setFolderType(EmailClientApi::NmApiEmailFolderType folderType);
 
-    /*
-     * seter for childfolder ids
+    /*!
+       setter for childfolder ids
      */
     void setChildFolderIds(QList<quint64> &childFolderIds);
 
-    /*
-     * seter for childfolder ids
+    /*!
+       setter for childfolder ids
      */
     void setParentFolderId(quint64 parentId);
 
-    /*
-     * returns child folder ids.
-     * to be implemented later when nmail functionality is available
+    /*!
+       returns child folder ids.
+       to be implemented later when nmail functionality is available
      */
     void getChildFolderIds(QList<quint64> &childFolderIds);
 
-    /*
-     * returns parent folder id.
-     * 
+    /*!
+       returns parent folder id.
+       
      */
     quint64 parentFolderId() const;
 
 private:
-    QExplicitlySharedDataPointer<NmFolderPrivate> d;
+    QExplicitlySharedDataPointer<NmApiFolderPrivate> d;
 };
 
 }

--- a/email_plat/nmail_client_api/nmapifolderlisting.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapifolderlisting.h	Fri May 14 15:41:10 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -18,88 +18,85 @@
 #ifndef NMAPIFOLDERLISTING_H_
 #define NMAPIFOLDERLISTING_H_
 
-#include <QObject>
+#include <nmapimessagetask.h>
+#include <nmapidef.h>
 
-#include "nmapimessagetask.h"
-#include "nmapimailbox.h"
-#include "nmenginedef.h"
-#include "nmapifolder.h"
-
-class NmEngine;
+class NmApiEngine;
 
 namespace EmailClientApi
 {
 
-class NmFolderListingPrivate;
-
+class NmApiFolderListingPrivate;
+class NmApiMailbox;
+class NmApiFolder;
 /*!
- * \class Class for creating list of all folders
+   \class Class for creating list of all folders
  */
-class NMENGINE_EXPORT NmFolderListing : public NmMessageTask
+class NMAPI_EXPORT NmApiFolderListing : public NmApiMessageTask
 {
     Q_OBJECT
 public:
     /*!
-     * Constructor of class. It set start values.
+       Constructor of class. It set start values.
      */
-    NmFolderListing( QObject *parent, const quint64 &nmMailboxId );
+    NmApiFolderListing(QObject *parent, const quint64 &nmMailboxId);
     /*!
-     * Destructor of class. It release engine to be safe if manual releasing won't work.
+       Destructor of class. It release engine to be safe if manual releasing won't work.
      */
-    ~NmFolderListing();
+    ~NmApiFolderListing();
 
     enum {FolderListingFailed = -1};
 
     /*! 
-     * \brief Returns results after foldersListed signal is received.
-     * 
-     *  Caller gets ownership of messages. Returns true if results were available.
-     *  It clears list of folders after be called.
-     *  It also at start clear inputlist of NmFolder.
+       \brief Returns results after foldersListed signal is received.
+       
+        Before calling this method, cancel and start should be called, 
+        because after second call it returns empty list..
+        It also at start clear inputlist of NmFolder.
      */
-    bool getFolders(QList<EmailClientApi::NmFolder> &folders);
+    bool getFolders(QList<EmailClientApi::NmApiFolder> &folders);
 
     /*!
-     * \brief Return info if listing is running
+       \brief Returns info if listing is running
      */
     bool isRunning() const;
 
     signals:
     /*!
-     * emitted when listing is available, count is number of folders found
-     * or FolderListingFailed if listing failed
+       emitted when listing is available, count is number of folders found
+       or FolderListingFailed if listing failed
      */
     void foldersListed(qint32 count);
 
 public slots:
     /*!
-     * \brief Starts gathering folders list.
-     * 
-     * In first turn it will get whole folderlist. 
-     * \todo After that it will wait for folder events.
-     * If start works, it do nothing.
-     * 
-     * To asynchronous operation ce be used \sa QTimer::singleShot on this method.
-     * Example:
-     * <code> 
-     * QTimer::singleShot(0,nmFolderListing,SLOT(start());
-     * </code>
-     * 
+       \brief Starts gathering folders list.
+       
+       In first turn it will get whole folderlist. 
+       \todo After that it will wait for folder events.
+       If start works, it do nothing.
+       
+       To asynchronous operation ce be used \sa QTimer::singleShot on this method.
+       Example:
+       <code> 
+       QTimer::singleShot(0,nmFolderListing,SLOT(start());
+       </code>
+       
      */
-    virtual bool start();
+    bool start();
 
     /*!
-     * \brief Stop gathering folder list.
-     * 
-     * In first it change state of listing.
-     * Then it release engine.
-     * On end it clears list of folders and emits \sa NmMessageTask::canceled() signal.
+       \brief Stops gathering folder list.
+       
+       In first it change state of listing.
+       Then it release engine.
+       On end it clears list of folders and emits \sa NmApiMessageTask::canceled() signal.
      */
-    virtual void cancel();
+    void cancel();
 
 private:
-    NmFolderListingPrivate* mFolderListing;
+    NmApiFolderListingPrivate *mFolderListing;
 };
 }
 
-#endif /* NMFOLDERLISTING_H_ */
+#endif /* NMAPIFOLDERLISTING_H_ */

--- a/email_plat/nmail_client_api/nmapimailbox.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimailbox.h	Fri May 14 15:41:10 2010 +0300
@@ -18,69 +18,79 @@
 #ifndef NMAPIMAILBOX_H
 #define NMAPIMAILBOX_H
 
-#include <QString>
 #include <QExplicitlySharedDataPointer>
-#include "nmenginedef.h"
-/**
- * Mailbox metadata class
+#include <nmapidef.h>
+
+class QString;
+
+/*!
+   Mailbox metadata class
  */
 
 namespace EmailClientApi
 {
-class NmMailboxPrivate : public QSharedData
+
+class NmApiMailboxPrivate;
+
+class NMAPI_EXPORT NmApiMailbox
 {
 public:
-    NmMailboxPrivate();
-    virtual ~NmMailboxPrivate();
-
-    quint64 id;
-    QString name;
-    QString address;
-};
-
-class NMENGINE_EXPORT NmMailbox
-{
-public:
-    /*
-     *  constructor for nmmailbox 
+    /*!
+        constructor for NmApiMailbox 
+     */
+    NmApiMailbox();
+    
+    /*!
+        Copy constructor for NmApiMailbox 
+     */
+   NmApiMailbox(const NmApiMailbox &nmApiMailbox);
+    
+    /*!
+       destructor for NmApiMailbox
      */
-    NmMailbox();
-    /*
-     * destructor for nmmailbox
+    virtual ~NmApiMailbox();
+    
+    /*!
+       Assign data from \a mailbox
      */
-    virtual ~NmMailbox();
-    NmMailbox &operator=(const NmMailbox &mailbox);
-    /*
-     * getter for id
+    NmApiMailbox &operator=(const NmApiMailbox &mailbox);
+    
+    /*!
+       Compare data from \a mailbox
+     */
+    bool operator==(const NmApiMailbox &mailbox);
+    
+    /*!
+       getter for id
      */
     quint64 id() const;
 
-    /*
-     * getter for name
+    /*!
+       getter for name
      */
     QString name() const;
 
-    /*
-     * getter for address
+    /*!
+       getter for address
      */
     QString address() const;
 
-    /*
-     * setter for id
+    /*!
+       setter for id
      */
     void setId(quint64 id);
 
-    /* 
-     * setter for name
+    /*! 
+       setter for name
      */
     void setName(const QString &name);
 
-    /*
-     * setter for address
+    /*!
+       setter for address
      */
     void setAddress(const QString &address);
 private:
-    QExplicitlySharedDataPointer<NmMailboxPrivate> d;
+    QExplicitlySharedDataPointer<NmApiMailboxPrivate> d;
 };
 }
 #endif

--- a/email_plat/nmail_client_api/nmapimailboxlisting.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimailboxlisting.h	Fri May 14 15:41:10 2010 +0300
@@ -18,94 +18,96 @@
 #ifndef NMAPIMAILBOXLISTING_H_
 #define NMAPIMAILBOXLISTING_H_
 
-#include <QObject>
 
-#include "nmapimessagetask.h"
-#include "nmapimailbox.h"
-#include "nmenginedef.h"
+#include <nmapimessagetask.h>
+#include <nmapidef.h>
+
+class QObject;
 
 namespace EmailClientApi
 {
-class NmMailboxListingPrivate;
+class NmApiMailboxListingPrivate;
+class NmApiMailbox;
 
 /*!
- * \class Class for creating list of all mailboxes
+   \class Class for creating list of all mailboxes
  */
-class NMENGINE_EXPORT NmMailboxListing : public NmMessageTask
+class NMAPI_EXPORT NmApiMailboxListing : public NmApiMessageTask
 {
     Q_OBJECT
 public:
     /*!
-     * Constructor of class. It set start values.
+       Constructor of class. It set start values.
      */
-    NmMailboxListing( QObject *parent );
+    NmApiMailboxListing(QObject *parent);
     /*!
-     * Destructor of class. It release engine to be safe if manual releasing won't work.
+       Destructor of class. It release engine to be safe if manual releasing won't work.
      */
-    virtual ~NmMailboxListing();
+    ~NmApiMailboxListing();
 
     enum {MailboxListingFailed = -1};
 
     /*! 
-     * \brief Returns results after mailboxesListed signal is received.
-     * 
-     *  Caller gets ownership of mailboxes. Returns true if results were available.
-     *  It clears list of mailboxes (in private members) after be called.
-     *  At start it clear inputlist of mailboxes.
-     *  
-     *  \return Return true if results were avaible
-     *  \arg List of mailboxes to filled. On start is cleared. 
+       \brief Returns results after mailboxesListed signal is received.
+       
+        Caller gets ownership of mailboxes. Returns true if results were available.
+        Before calling this method, cancel and start should be called, 
+        because after second call it returns empty list.
+        At start it clear inputlist of mailboxes.
+        
+        \return Return true if results were avaible
+        \param mailboxes List of mailboxes to filled. On start is cleared. 
      */
-    bool getMailboxes(QList<EmailClientApi::NmMailbox> &mailboxes);
+    bool getMailboxes(QList<EmailClientApi::NmApiMailbox> &mailboxes);
 
     /*!
-     * \brief Return info if listing is running
-     * 
-     * \return Return true if listing is running
+       \brief Return info if listing is running
+       
+       \return Return true if listing is running
      */
     bool isRunning() const;
 
     signals:
     /*!
-     * 
-     * emitted when listing is available, count is number of mailboxes found
-     * or MailboxListingFailed if listing failed
-     * 
-     * \arg Count of mailboxes inside class.
+       
+       emitted when listing is available, count is number of mailboxes found
+       or MailboxListingFailed if listing failed
+       
+       \param count Count of mailboxes inside class.
      */
     void mailboxesListed(qint32 count);
 
 public slots:
     /*!
-     * \brief Starts gathering mailbox list.
-     * 
-     * In first turn it will get whole mailboxlist. 
-     * Then it initialize core arguments and emits signal when ready.
-     * 
-     * To asynchronous operation can be used \sa QTimer::singleShot on this method.
-     * Example:
-     * <code> 
-     * QTimer::singleShot(0,nmMailboxListing,SLOT(start());
-     * </code>
-     * 
-     * \return Return true if everything go good and core of listing works good.
-     * 
+       \brief Starts gathering mailbox list.
+       
+       In first turn it will get whole mailboxlist. 
+       Then it initialize core arguments and emits signal when ready.
+       
+       To asynchronous operation can be used \sa QTimer::singleShot on this method.
+       Example:
+       <code> 
+       QTimer::singleShot(0,nmMailboxListing,SLOT(start());
+       </code>
+       
+       \return Return true if everything go good and core of listing works good.
+       
      */
-    virtual bool start();
+    bool start();
 
     /*!
-     * \brief Stop gathering mailbox list.
-     * 
-     * In first it change state of listing.
-     * Then it release engine.
-     * On end it clears list of mailboxes and emits \sa NmMessageTask::canceled() signal.
+       \brief Stop gathering mailbox list.
+       
+       In first it change state of listing.
+       Then it release engine.
+       On end it clears list of mailboxes and emits \sa NmApiMessageTask::canceled() signal.
      */
-    virtual void cancel();
+    void cancel();
 
 private:
-    NmMailboxListingPrivate *mNmMailboxListingPrivate;
+    NmApiMailboxListingPrivate *mNmApiMailboxListingPrivate;
 };
 
 }
 
-#endif /* NMMAILBOXLISTING_H_ */
+#endif /* NMAPIMAILBOXLISTING_H_ */

--- a/email_plat/nmail_client_api/nmapimessagebody.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimessagebody.h	Fri May 14 15:41:10 2010 +0300
@@ -18,66 +18,72 @@
 #ifndef NMAPIMESSAGEBODY_H
 #define NMAPIMESSAGEBODY_H
 
-#include <QString>
 #include <QExplicitlySharedDataPointer>
-#include "nmenginedef.h"
+#include <nmapidef.h>
+
+class QString;
 
 namespace EmailClientApi
 {
 
-class NmMessageBodyPrivate : public QSharedData
+class NmApiMessageBodyPrivate;
+
+class NMAPI_EXPORT NmApiMessageBody
 {
 public:
-    NmMessageBodyPrivate();
-    virtual ~NmMessageBodyPrivate();
-
-    quint64 totalSize;
-    quint64 fetchedSize;
-    QString content;
-};
-
-class NMENGINE_EXPORT NmMessageBody
-{
-public:
-    /*
-     * constructor for nmmessagebody
+    /*!
+       constructor for NmApiMessageBody
+     */
+    NmApiMessageBody();
+    /*!
+       copying constructor for NmApiMessageBody
      */
-    NmMessageBody();
-
-    virtual ~NmMessageBody();
+    NmApiMessageBody(const NmApiMessageBody &apiMessageBody);
+    
+    /*!
+       assignment operator for NmApiMessageBody
+     */    
+    NmApiMessageBody& operator=(const NmApiMessageBody &apiMessageBody);
+    
+    /*!
+       Compare data from \a apiMessageBody
+     */    
+    bool operator==(const NmApiMessageBody &apiMessageBody);
+    
+    virtual ~NmApiMessageBody();
 
     /*!
-     * getter for total size of message body in bytes
+       getter for total size of message body in bytes
      */
     quint64 totalSize() const;
 
     /*!
-     * getter for bytes available in local mailbox store
+       getter for bytes available in local mailbox store
      */
     quint64 fetchedSize() const;
 
     /*!
-     * getter for fetched content
+       getter for fetched content
      */
     QString content() const;
 
-    /*
-     * setter for total size of message body in bytes
+    /*!
+       setter for total size of message body in bytes
      */
     void setTotalSize(quint64 size);
 
-    /*
-     * setter for bytes available on local mailbox store
+    /*!
+       setter for bytes available on local mailbox store
      */
     void setFetchedSize(quint64 size);
 
-    /*
-     * setter for content
+    /*!
+       setter for content
      */
-    void setContent(const QString& content);
+    void setContent(const QString &content);
 
 private:
-    QExplicitlySharedDataPointer<NmMessageBodyPrivate> d;
+    QExplicitlySharedDataPointer<NmApiMessageBodyPrivate> d;
 };
 }
 #endif

--- a/email_plat/nmail_client_api/nmapimessageenvelope.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimessageenvelope.h	Fri May 14 15:41:10 2010 +0300
@@ -15,218 +15,209 @@
  *
  */
 
-#ifndef NMAPIMESSAGEENVELOPEINFO_H
-#define NMAPIMESSAGEENVELOPEINFO_H
+#ifndef NMAPIMESSAGEENVELOPE_H
+#define NMAPIMESSAGEENVELOPE_H
+
 
-#include <QString>
-#include <QDateTime>
 #include <QExplicitlySharedDataPointer>
+#include <QList>
 
-#include "nmenginedef.h"
-#include "nmapiemailaddress.h"
-#include "nmapimessagebody.h"
+#include <nmapidef.h>
+
+class QString;
+class QDateTime;
 
 namespace EmailClientApi
 {
-class NmMessageEnvelopePrivate : public QSharedData
+class NmApiMessageEnvelopePrivate;
+class NmApiEmailAddress;
+class NmApiMessageBody;
+
+// read-only envelope
+class NMAPI_EXPORT NmApiMessageEnvelope
 {
 public:
-    NmMessageEnvelopePrivate();
-    virtual ~NmMessageEnvelopePrivate();
-
-    bool read;
-    bool attachments;
-    bool forwarded;
-    bool replied;
-
-    QList<EmailClientApi::NmEmailAddress> ccRecipients;
-    QList<EmailClientApi::NmEmailAddress> toRecipients;
-
-    quint64 id;
-    quint64 parentFolder;
-
-    QString contentType;
-    QString subject;
-    QString sender;
+    /*!
+       constructor for NmApiMessageEnvelope
+     */
+    NmApiMessageEnvelope();
+    
+    /*!
+       destructor for NmApiMessageEnvelope
+     */
+    virtual ~NmApiMessageEnvelope();
+    
+    /*!
+       copying constructor for NmApiMessageEnvelope
+     */
+    NmApiMessageEnvelope(const NmApiMessageEnvelope &envelope);
 
-    QString plainText;
-    quint64 totalSize;
-    quint64 fetchedSize;
-
-    QDateTime sentTime;
-};
+    /*!
+       Assignment operator
+     */
+    NmApiMessageEnvelope &operator=(const NmApiMessageEnvelope &envelope);
 
-// read-only envelope
-class NMENGINE_EXPORT NmMessageEnvelope
-{
-public:
-    /*
-     * constructor for nmmessageenvelope
+    /*!
+       Comapre data from \a envelope
      */
-    NmMessageEnvelope();
-    /*
-     * destructor for nmmessageenvelope
-     */
-    virtual ~NmMessageEnvelope();
-    NmMessageEnvelope &operator=(const NmMessageEnvelope &envelope);
-
+    bool operator==(const NmApiMessageEnvelope &envelope);
     /*!        
-     * getter for id
+       getter for id
      */
     quint64 id() const;
 
-    /*
-     * getter for id of parent folder
+    /*!
+       getter for id of parent folder
      */
     quint64 parentFolder() const;
 
-    /*
-     * getter for subject
+    /*!
+       getter for subject
      */
     QString subject() const;
 
-    /*
-     * getter for sender
+    /*!
+       getter for sender
      */
     QString sender() const;
 
-    /*
-     * getter for to recipients
+    /*!
+       getter for to recipients
      */
-    void getToRecipients( QList<EmailClientApi::NmEmailAddress> &toRecipients );
+    void getToRecipients(QList<EmailClientApi::NmApiEmailAddress> &toRecipients);
 
-    /*
-     * getter for cc recipients
+    /*!
+       getter for cc recipients
      */
-    void getCcRecipients( QList<EmailClientApi::NmEmailAddress> &ccRecipients );
+    void getCcRecipients(QList<EmailClientApi::NmApiEmailAddress> &ccRecipients);
 
-    /*
-     * getter for sent time
+    /*!
+       getter for sent time
      */
     QDateTime sentTime() const;
 
-    /*
-     * getter for is read flag
+    /*!
+       getter for is read flag
      */
     bool isRead() const;
 
-    /*
-     * getter for has attachments flag
+    /*!
+       getter for has attachments flag
      */
     bool hasAttachments() const;
 
-    /*
-     * getter for is forwarded flag
+    /*!
+       getter for is forwarded flag
      */
     bool isForwarded() const;
 
-    /*
-     * getter for is replied flag
+    /*!
+       getter for is replied flag
      */
     bool isReplied() const;
 
-    /*
-     * getter for content type
+    /*!
+       getter for content type
      */
     QString contentType() const;
 
-    /*
-     * getter for plaintext body
+    /*!
+       getter for plaintext body
      */
-    void getPlainTextBody( EmailClientApi::NmMessageBody &body );
+    void getPlainTextBody(EmailClientApi::NmApiMessageBody &body);
 
-    /*
-     * getter for plaintext body
+    /*!
+       getter for plaintext body
      */
     QString plainText() const;
 
-    /*
-     * getter for messages fetched size 
+    /*!
+       getter for messages fetched size 
      */
     quint64 totalSize() const;
 
-    /*
-     * getter for messages fetched size 
+    /*!
+       getter for messages fetched size 
      */
     quint64 fetchedSize() const;
 
-    /*
-     * setter for id 
+    /*!
+       setter for id 
      */
     void setId(quint64 id);
 
-    /*
-     * setter for parent folder 
+    /*!
+       setter for parent folder 
      */
     void setParentFolder(quint64 parentFolder);
 
-    /*
-     * setter for subject 
+    /*!
+       setter for subject 
      */
-    void setSubject(const QString& subject);
+    void setSubject(const QString &subject);
 
-    /*
-     * setter for sender  
+    /*!
+       setter for sender  
      */
-    void setSender(const QString& sender);
+    void setSender(const QString &sender);
 
-    /*
-     * setter for to recipients 
+    /*!
+       setter for to recipients 
      */
-    void setToRecipients(const QList<EmailClientApi::NmEmailAddress>& toRecipients);
+    void setToRecipients(const QList<EmailClientApi::NmApiEmailAddress> &toRecipients);
 
-    /*
-     * setter for cc recipients 
+    /*!
+       setter for cc recipients 
      */
-    void setCcRecipients(const QList<EmailClientApi::NmEmailAddress> &ccRecipients);
+    void setCcRecipients(const QList<EmailClientApi::NmApiEmailAddress> &ccRecipients);
 
-    /*
-     * setter for sent time 
+    /*!
+       setter for sent time 
      */
     void setSentTime(QDateTime sentTime);
 
-    /*
-     * setter for is read flag
+    /*!
+       setter for is read flag
      */
     void setIsRead(bool isRead);
 
-    /*
-     * setter for has attachments flag 
+    /*!
+       setter for has attachments flag 
      */
     void setHasAttachments(bool hasAttachments);
 
-    /*
-     * setter for is forwarded flag 
+    /*!
+       setter for is forwarded flag 
      */
     void setIsForwarded(bool isForwarded);
 
-    /*
-     * setter for is replied flag 
+    /*!
+       setter for is replied flag 
      */
     void setIsReplied(bool isReplied);
 
-    /*
-     * setter for content type 
+    /*!
+       setter for content type 
      */
     void setContentType(const QString &contentType);
 
-    /*
-     * getter for messages plain text 
+    /*!
+       getter for messages plain text 
      */
     void setPlainText(const QString &plainText);
 
-    /*
-     * getter for messages fetched size 
+    /*!
+       getter for messages fetched size 
      */
     void setTotalSize(quint64 totalSize);
 
-    /*
-     * getter for messages fetched size 
+    /*!
+       getter for messages fetched size 
      */
     void setFetchedSize(quint64 fetchedSize);
 
 private:
-    QExplicitlySharedDataPointer<NmMessageEnvelopePrivate> d;
+    QExplicitlySharedDataPointer<NmApiMessageEnvelopePrivate> d;
 };
 }
 #endif

--- a/email_plat/nmail_client_api/nmapimessagetask.h	Mon May 03 12:23:15 2010 +0300
+++ b/email_plat/nmail_client_api/nmapimessagetask.h	Fri May 14 15:41:10 2010 +0300
@@ -20,41 +20,41 @@
 
 #include <QObject>
 
-#include "nmenginedef.h"
+#include <nmapidef.h>
 
-/**
- * base class for async tasks
+/*!
+   base class for async tasks
  */
-class NMENGINE_EXPORT NmMessageTask : public QObject
+class NMAPI_EXPORT NmApiMessageTask : public QObject
 {
     Q_OBJECT
 protected:
-    NmMessageTask( QObject *parent );
+    NmApiMessageTask(QObject *parent);
 
 public:
-    virtual ~NmMessageTask();
+    virtual ~NmApiMessageTask();
 
 public slots:
     /*!
-     * Starts task and returns true if starting succeeded.
+       Starts task and returns true if starting succeeded.
      */
-    virtual bool start()=0;
+    virtual bool start() = 0;
 
     /*!
-     * Cancels started but not yet completed task. may not be applicable
-     * in all tasks.
+       Cancels started but not yet completed task. may not be applicable
+       in all tasks.
      */
-    virtual void cancel() =0;
+    virtual void cancel() = 0;
 
     signals:
     /*!
-     * task failed, error code is specific to concrete task
+       task failed, error code is specific to concrete task
      */
-    void failed(int error);
+    void failed (int error);
     /*!
-     * task canceled
+       task canceled
      */
     void canceled();
 };
 
-#endif /* NMMESSAGETASK_H_ */
+#endif /*NMAPIMESSAGETASK_H_ */

--- a/email_plat/nmail_client_api/nmcommon_api.h	Mon May 03 12:23:15 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#ifndef NMAPICOMMON_API_H_
-#define NMAPICOMMON_API_H_
-
-#include <QtCore>
-
-/*!
- * Enum to describe mailbox events
- */
-enum MailboxEvent
-{
-    MailboxCreated, MailboxDeleted
-};
-Q_DECLARE_METATYPE ( MailboxEvent)
-/*!
- * Enum to describe message events.
- */
-enum MessageEvent {
-    MessageCreated,
-    MessageDeleted,
-    MessageChanged    
-};
-
-Q_DECLARE_METATYPE(MessageEvent)
-#endif /* NMCOMMON_API_H_ */

--- a/email_plat/nmail_client_api/nmenginedef.h	Mon May 03 12:23:15 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#ifndef NMAPIENGINEDEF_H_
-#define NMAPIENGINEDEF_H_
-
-#include <QtGlobal>
-
-#if defined(Q_OS_WIN)
-#define NMENGINE_EXPORT __declspec(dllexport)
-#else
-
-#if defined(BUILD_ENGINE_DLL)
-#define NMENGINE_EXPORT Q_DECL_EXPORT
-#else
-#define NMENGINE_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif
-
-#endif /* NMENGINEDEF_H_ */

--- a/emailservices/emailcommon/inc/CFSMailCommon.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailcommon/inc/CFSMailCommon.h	Fri May 14 15:41:10 2010 +0300
@@ -312,6 +312,9 @@
 
 
 _LIT(KFSMailContentDispAttachment, " attachment");
+//<qmail>
+_LIT(KFSMailContentDispInline, "inline");
+//</qmail>
 _LIT(KFSMailContentDispParamFilename, " filename=");
 
 /** mailbox synchronization states */
@@ -339,7 +342,8 @@
     PushChannelOff,
     PushChannelEstablished,
     PushChannelOffBecauseBatteryIsLow,
-    OutOfDiskSpace
+    OutOfDiskSpace,
+    ServerConnectionError // <qmail> new error code for sync
     };
 
 /**
@@ -438,7 +442,12 @@
         TFSEventMailboxOnline,
 
         // Mailbox went offline
-        // aParam1: NULL
+        // <qmail>
+        // aParam1: TInt possible errorCode.
+        //          Plugin may specify an error code here if it sees that connection was cut off unexpectedly;
+        //          Client can then have a separate handling for this exception.
+        //          KErrDisconnected should be used in situations where network coverage was dropped off unexpectedly.
+        // </qmail>
         // aParam2: NULL
         // aParam3: NULL
         TFSEventMailboxOffline,

--- a/emailservices/emailcommon/src/CFSMailMessage.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessage.cpp	Fri May 14 15:41:10 2010 +0300
@@ -487,8 +487,7 @@
 // -----------------------------------------------------------------------------
 EXPORT_C NmMessage* CFSMailMessage::GetNmMessage()
 {
-	NmMessage* message = new NmMessage(iNmPrivateMessagePart);
-	message->setEnvelope(iNmPrivateMessageEnvelope);
+	NmMessage* message = new NmMessage(iNmPrivateMessageEnvelope, iNmPrivateMessagePart);
 	return message;
 }
 //</qmail>

--- a/emailservices/emailcommon/src/CFSMailMessageBase.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessageBase.cpp	Fri May 14 15:41:10 2010 +0300
@@ -75,10 +75,10 @@
     iNmPrivateMessageEnvelope = new NmMessageEnvelopePrivate();
 
 	// typedef long int TInt32 -> typedef unsigned int quint32
-    iNmPrivateMessageEnvelope->mId.setId32((quint32)aMessageId.Id() );
+    iNmPrivateMessageEnvelope->mMessageId.setId32((quint32)aMessageId.Id() );
 
 	// typedef unsigned int TUint -> typedef unsigned int quint32
-    iNmPrivateMessageEnvelope->mId.setPluginId32((quint32)aMessageId.PluginId().iUid);
+    iNmPrivateMessageEnvelope->mMessageId.setPluginId32((quint32)aMessageId.PluginId().iUid);
 
     // construct the CFSMailAddress object and connect it with NmAddress private data
     iSender = CFSMailAddress::NewL(iNmPrivateMessageEnvelope->mSender);
@@ -120,11 +120,11 @@
     FUNC_LOG;
 // <qmail>
     //For message  
-    TFSMailMsgId id = TFSMailMsgId(iNmPrivateMessageEnvelope->mId);
+    TFSMailMsgId id = TFSMailMsgId(iNmPrivateMessageEnvelope->mMessageId);
     
     //For message part
     if(id.IsNullId()){
-        id = TFSMailMsgId(iNmPrivateMessageEnvelope->mParentId);
+        id = TFSMailMsgId(iNmPrivateMessageEnvelope->mFolderId);
     }
 	
     return id;
@@ -138,10 +138,11 @@
 EXPORT_C void CFSMailMessageBase::SetMessageId( const TFSMailMsgId aMessageId )
 {
     // typedef long int TInt32 -> typedef unsigned int quint32
-    iNmPrivateMessageEnvelope->mId.setId32( aMessageId.Id() );
+    iNmPrivateMessageEnvelope->mMessageId.setId32( aMessageId.Id() );
 
     // typedef unsigned int TUint -> typedef unsigned int quint32
-    iNmPrivateMessageEnvelope->mId.setPluginId32((unsigned int)aMessageId.PluginId().iUid);
+    iNmPrivateMessageEnvelope->mMessageId.setPluginId32(
+            (unsigned int)aMessageId.PluginId().iUid);
 }
 //</qmail>
 
@@ -152,7 +153,7 @@
 {
     FUNC_LOG;
 // <qmail>
-    return TFSMailMsgId(iNmPrivateMessageEnvelope->mParentId);
+    return TFSMailMsgId(iNmPrivateMessageEnvelope->mFolderId);
 // </qmail>
 }
 
@@ -163,7 +164,7 @@
 {
     FUNC_LOG;
 // <qmail>
-    iNmPrivateMessageEnvelope->mParentId = NmConverter::mailMsgIdToNmId(aFolderId);
+    iNmPrivateMessageEnvelope->mFolderId = NmConverter::mailMsgIdToNmId(aFolderId);
 // </qmail>
 }
 
@@ -483,7 +484,7 @@
     {
     FUNC_LOG;
     if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(
-		iNmPrivateMessageEnvelope->mId ) )
+		iNmPrivateMessageEnvelope->mMessageId ) )
         {
         // If plugin has created the extension, let it handle destruction.
         plugin->ReleaseExtension( aExtension );
@@ -508,7 +509,7 @@
         // check that plugin supports requested extension.
 // <qmail>
         if ( CFSMailPlugin* plugin = iRequestHandler->GetPluginByUid(
-			iNmPrivateMessageEnvelope->mId ) )
+			iNmPrivateMessageEnvelope->mMessageId ) )
 // </qmail>
             {
             // request extension from plugin, leaves if not supported

--- a/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/emailcommon/src/CFSMailMessagePart.cpp	Fri May 14 15:41:10 2010 +0300
@@ -91,8 +91,8 @@
 	
 	iNmPrivateMessagePart = new NmMessagePartPrivate();
 	
-	iNmPrivateMessagePart->mOwnId.setId32(aMessagePartId.Id());
-	iNmPrivateMessagePart->mOwnId.setPluginId32((quint32)aMessagePartId.PluginId().iUid);
+	iNmPrivateMessagePart->mPartId.setId32(aMessagePartId.Id());
+	iNmPrivateMessagePart->mPartId.setPluginId32((quint32)aMessagePartId.PluginId().iUid);
 		
 	iMessagePartsStatus = EFSDefault;
 
@@ -231,7 +231,7 @@
 {
     FUNC_LOG;
 //<qmail>
-    return TFSMailMsgId(iNmPrivateMessagePart->mOwnId);
+    return TFSMailMsgId(iNmPrivateMessagePart->mPartId);
 //</qmail>	
 }
 
@@ -1030,7 +1030,15 @@
 		
 //<qmail>
 	    buffer = HBufC::NewL(length);
-	    buffer->Des().Append(KFSMailContentDispAttachment);
+	    if (ContentDisposition().FindF(KFSMailContentDispInline) != KErrNotFound)
+	        {
+            buffer->Des().Append(KFSMailContentDispInline);
+	        }
+	    else
+	        {
+            buffer->Des().Append(KFSMailContentDispAttachment);
+	        }
+	    
 	    buffer->Des().Append(_L("; "));
 	    buffer->Des().Append(KFSMailContentDispParamFilename);
 	    buffer->Des().Append('"');