--- a/emailservices/nmclientapi/inc/nmapienvelopelisting_p.h	Tue Jun 29 17:12:28 2010 +0300
+++ b/emailservices/nmclientapi/inc/nmapienvelopelisting_p.h	Fri Jul 02 15:55:16 2010 +0300
@@ -29,20 +29,21 @@
 
 class NmApiEnvelopeListingPrivate : public QObject
 {
+    Q_OBJECT
+    
 public:
-
-    NmApiEnvelopeListingPrivate(QObject *parent = 0);
+    NmApiEnvelopeListingPrivate(const quint64 folderId, const quint64 mailboxId, QObject *parent = 0);
     virtual ~NmApiEnvelopeListingPrivate();
+    bool envelopes(QList<EmailClientApi::NmApiMessageEnvelope> &envelopes);
+    qint32 listEnvelopes();
+    bool isRunning() const;
+    void cancel();
 
-    bool initializeEngine();
-    void releaseEngine();
-    qint32 grabEnvelopes();
-
+private:
+    quint64 mFolderId;
+    quint64 mMailboxId;
     bool mIsRunning;
-    quint64 folderId;
-    quint64 mailboxId;
     NmApiEngine *mEngine;
-
     QList<EmailClientApi::NmApiMessageEnvelope> mEnvelopes;
 };
 }