diff -r ecc8def7944a -r 2dc6caa42ec3 email_plat/nmail_client_api/nmapimessagebody.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