--- a/emailservices/nmclientapi/inc/nmapimessagesearch_p.h	Thu Sep 30 11:43:07 2010 +0300
+++ b/emailservices/nmclientapi/inc/nmapimessagesearch_p.h	Thu Oct 14 17:33:43 2010 +0300
@@ -19,25 +19,27 @@
 #define NMAPIMESSAGESEARCHPRIVATE_H_
 
 #include <MFSMailBoxSearchObserver.h>
-#include <CFSMailBox.h>
 #include <nmapicommon.h>
 #include <nmapimessage.h>
 
+
+class CFSMailBox;
+namespace EmailClientApi
+{
 class NmApiEngine;
-class CFSMailBox;
 
 class NmApiMessageSearchPrivate : public QObject,
-                                    public MFSMailBoxSearchObserver
+                                  public MFSMailBoxSearchObserver
 {
     Q_OBJECT
 
 public:
     
-    NmApiMessageSearchPrivate(const quint64 mailboxId, QObject *parent = 0);
+    NmApiMessageSearchPrivate(const quint64 mailboxId, QObject *parent = NULL);
 
-    ~NmApiMessageSearchPrivate();
+    virtual ~NmApiMessageSearchPrivate();
 
-    bool initialise(const QList<QString> &searchStrings, EmailClientApi::NmApiMailSortCriteria sortCriteria);
+    bool initialise(const QList<QString> &searchStrings, NmApiMailSortCriteria sortCriteria);
     
     bool isRunning() const;
     
@@ -75,5 +77,6 @@
     NmApiEngine *mEngine;
     
 };
+}
 
 #endif /* NMAPIMESSAGESEARCHPRIVATE_H_ */