diff -r ecc8def7944a -r 2dc6caa42ec3 emailservices/nmclientapi/src/nmapiemailaddress.cpp
--- a/emailservices/nmclientapi/src/nmapiemailaddress.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapiemailaddress.cpp	Fri May 14 15:41:10 2010 +0300
@@ -15,58 +15,87 @@
  *
  */
 
-#include "nmapiemailaddress.h"
+#include <nmapiemailaddress.h>
+#include "nmapiemailaddress_p.h"
+
 namespace EmailClientApi
 {
-NmEmailAddressPrivate::NmEmailAddressPrivate()
+/*!
+   copying constructor for nmmessageenvelope
+ */
+NmApiEmailAddress::NmApiEmailAddress(const NmApiEmailAddress &envelope) :
+    d(envelope.d)
 {
+
 }
 
-NmEmailAddressPrivate::~NmEmailAddressPrivate()
+/*!
+   Constructor for NmApiEmailAddress class
+ */
+NmApiEmailAddress::NmApiEmailAddress()
 {
+    d = new NmApiEmailAddressPrivate();
 }
 
-/*
- * Constructor for NmEmailAddress class
+/*!
+   destructor
  */
-NmEmailAddress::NmEmailAddress()
-{
-    d = new NmEmailAddressPrivate();
-}
-
-NmEmailAddress::~NmEmailAddress()
+NmApiEmailAddress::~NmApiEmailAddress()
 {
 
 }
 
-/*
- * getter for displayname
+/*!
+   Assignment operator
+ */
+NmApiEmailAddress &NmApiEmailAddress::operator=(const NmApiEmailAddress &addr)
+{
+    if (this != &addr) {
+        d = addr.d;
+    }
+    return *this;
+}
+
+/*!
+   Compare data from \a addr
  */
-QString NmEmailAddress::displayName() const
+bool NmApiEmailAddress::operator==(const NmApiEmailAddress &addr)
+{
+    bool retVal = false;
+    if (this->d == addr.d) {
+        retVal = true;
+    }
+    return retVal;
+}
+
+/*!
+   getter for displayname
+ */
+QString NmApiEmailAddress::displayName() const
 {
     return d->displayName;
 }
 
-/*
- * getter for address
+/*!
+   getter for address
  */
-QString NmEmailAddress::address() const
+QString NmApiEmailAddress::address() const
 {
     return d->address;
 }
 
-/*
- * setter for displayname 
+/*!
+   setter for displayname 
  */
-void NmEmailAddress::setDisplayName(const QString& displayName)
+void NmApiEmailAddress::setDisplayName(const QString &displayName)
 {
     d->displayName = displayName;
 }
 
-/*
- * setter for address
+/*!
+   setter for address
  */
-void NmEmailAddress::setAddress(const QString& address)
+void NmApiEmailAddress::setAddress(const QString &address)
 {
     d->address = address;
 }