--- 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;
 };
 }