diff -r ecc8def7944a -r 2dc6caa42ec3 emailservices/nmclientapi/inc/nmapienvelopelisting_p.h
--- a/emailservices/nmclientapi/inc/nmapienvelopelisting_p.h	Mon May 03 12:23:15 2010 +0300
+++ b/emailservices/nmclientapi/inc/nmapienvelopelisting_p.h	Fri May 14 15:41:10 2010 +0300
@@ -20,19 +20,19 @@
 
 #include <QObject>
 
-#include "nmapimessageenvelope.h"
+class NmApiEngine;
 
-class NmEngine;
 
 namespace EmailClientApi
 {
+class NmApiMessageEnvelope;
 
-class NmEnvelopeListingPrivate : public QObject
+class NmApiEnvelopeListingPrivate : public QObject
 {
 public:
 
-    NmEnvelopeListingPrivate(QObject *parent = 0);
-    virtual ~NmEnvelopeListingPrivate();
+    NmApiEnvelopeListingPrivate(QObject *parent = 0);
+    virtual ~NmApiEnvelopeListingPrivate();
 
     bool initializeEngine();
     void releaseEngine();
@@ -41,9 +41,9 @@
     bool mIsRunning;
     quint64 folderId;
     quint64 mailboxId;
-    NmEngine* mEngine;
+    NmApiEngine *mEngine;
 
-    QList<EmailClientApi::NmMessageEnvelope> mEnvelopes;
+    QList<EmailClientApi::NmApiMessageEnvelope> mEnvelopes;
 };
 }
-#endif /* NMENVELOPELISTINGPRIVATE_H_ */
+#endif /* NMAPIENVELOPELISTINGPRIVATE_H */