diff -r 6c59112cfd31 -r 38bf5461e270 emailservices/nmclientapi/src/nmapimessageenvelope.cpp
--- a/emailservices/nmclientapi/src/nmapimessageenvelope.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapimessageenvelope.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -17,8 +17,6 @@
 
 #include "nmapiheaders.h"
 
-
-
 namespace EmailClientApi
 {
 
@@ -177,7 +175,7 @@
 /*!
    getter for to recipients
  */
-void NmApiMessageEnvelope::getToRecipients(QList<EmailClientApi::NmApiEmailAddress> &toRecipients)
+void NmApiMessageEnvelope::getToRecipients(QList<NmApiEmailAddress> &toRecipients)
 {
     NM_FUNCTION;
     
@@ -187,7 +185,7 @@
 /*!
    getter for cc recipients
  */
-void NmApiMessageEnvelope::getCcRecipients(QList<EmailClientApi::NmApiEmailAddress> &ccRecipients)
+void NmApiMessageEnvelope::getCcRecipients(QList<NmApiEmailAddress> &ccRecipients)
 {
     NM_FUNCTION;
     
@@ -197,7 +195,7 @@
 /*!
    getter for bcc recipients
  */
-void NmApiMessageEnvelope::getBccRecipients(QList<EmailClientApi::NmApiEmailAddress> &bccRecipients)
+void NmApiMessageEnvelope::getBccRecipients(QList<NmApiEmailAddress> &bccRecipients)
 {
     NM_FUNCTION;
     
@@ -267,7 +265,7 @@
 /*!
    getter for plaintext body
  */
-void NmApiMessageEnvelope::getPlainTextBody(EmailClientApi::NmApiMessageBody &body)
+void NmApiMessageEnvelope::getPlainTextBody(NmApiMessageBody &body)
 {
     NM_FUNCTION;
     
@@ -330,7 +328,7 @@
    setter for to recipients 
  */
 void NmApiMessageEnvelope::setToRecipients(
-    const QList<EmailClientApi::NmApiEmailAddress> &toRecipients)
+    const QList<NmApiEmailAddress> &toRecipients)
 {
     NM_FUNCTION;
     
@@ -341,7 +339,7 @@
    setter for cc recipients 
  */
 void NmApiMessageEnvelope::setCcRecipients(
-    const QList<EmailClientApi::NmApiEmailAddress> &ccRecipients)
+    const QList<NmApiEmailAddress> &ccRecipients)
 {
     NM_FUNCTION;
     
@@ -352,7 +350,7 @@
    setter for bcc recipients 
  */
 void NmApiMessageEnvelope::setBccRecipients(
-    const QList<EmailClientApi::NmApiEmailAddress> &bccRecipients)
+    const QList<NmApiEmailAddress> &bccRecipients)
 {
     NM_FUNCTION;