--- a/emailservices/nmclientapi/src/nmapiemailservice.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapiemailservice.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -49,7 +49,7 @@
     const quint64 mailboxId,
     const quint64 folderId,
     const quint64 envelopeId,
-    EmailClientApi::NmApiMessageEnvelope &envelope)
+    NmApiMessageEnvelope &envelope)
 {
     NM_FUNCTION;
     
@@ -65,7 +65,7 @@
 bool NmApiEmailService::getFolder(
     const quint64 mailboxId,
     const quint64 folderId,
-    EmailClientApi::NmApiFolder &mailboxFolder)
+    NmApiFolder &mailboxFolder)
 {
     NM_FUNCTION;
 
@@ -81,7 +81,7 @@
 /*!
     gets mailbox info by id (see also NmEventNotifier)
  */
-bool NmApiEmailService::getMailbox(const quint64 mailboxId, EmailClientApi::NmApiMailbox &mailboxInfo)
+bool NmApiEmailService::getMailbox(const quint64 mailboxId, NmApiMailbox &mailboxInfo)
 {
     NM_FUNCTION;
     
@@ -98,7 +98,7 @@
     const quint64 mailboxId,
     const quint64 folderId,
     const quint64 messageId,
-    EmailClientApi::NmApiMessage &message)
+    NmApiMessage &message)
 {
     NM_FUNCTION;