--- a/emailservices/nmclientapi/src/nmapimessagesearch_p.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapimessagesearch_p.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -17,6 +17,9 @@
 
 #include "nmapiheaders.h"
 
+namespace EmailClientApi
+{
+
 /*!
     \class NmApiMessageSearchPrivate
     \brief A Qt wrapper class for MFSMailBoxSearchObserver.
@@ -115,7 +118,7 @@
     
     if (aMatchMessage) {
         NmMessage *nmmessage = aMatchMessage->GetNmMessage();
-        EmailClientApi::NmApiMessage message = NmToApiConverter::NmMessage2NmApiMessage(*nmmessage);
+        NmApiMessage message = NmToApiConverter::NmMessage2NmApiMessage(*nmmessage);
         emit messageFound(message);
         
         delete nmmessage;
@@ -135,7 +138,7 @@
 {
     NM_FUNCTION;
     mIsRunning = false;
-    emit searchComplete(EmailClientApi::NmApiNoError); 
+    emit searchComplete(NmApiNoError); 
 }
 
 
@@ -180,7 +183,7 @@
  
  Initialize search criterias.  
  */
-bool NmApiMessageSearchPrivate::initialise(const QList<QString> &searchStrings, EmailClientApi::NmApiMailSortCriteria sortCriteria)
+bool NmApiMessageSearchPrivate::initialise(const QList<QString> &searchStrings, NmApiMailSortCriteria sortCriteria)
 {
     NM_FUNCTION;
     bool ret = false;
@@ -231,4 +234,5 @@
         }
     }
 }
+}
 // End of file.