diff -r bf7eb7911fc5 -r 997a02608b3a emailservices/nmclientapi/src/nmapifolderlisting.cpp
--- a/emailservices/nmclientapi/src/nmapifolderlisting.cpp	Wed Jun 23 18:00:21 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapifolderlisting.cpp	Tue Jul 06 14:04:34 2010 +0300
@@ -15,13 +15,8 @@
  *
  */
 
-#include "emailtrace.h"
+#include "nmapiheaders.h"
 
-#include <nmapifolderlisting.h>
-#include "nmapifolderlisting_p.h"
-
-#include <nmapimailbox.h>
-#include <nmapifolder.h>
 
 namespace EmailClientApi
 {
@@ -33,14 +28,11 @@
 /*!
    Constructor of class. It set start values.
  */
-NmApiFolderListing::NmApiFolderListing(QObject *parent, const quint64 &nmMailboxId) :
+NmApiFolderListing::NmApiFolderListing(QObject *parent, const quint64 &mailboxId) :
     NmApiMessageTask(parent)
 {
     NM_FUNCTION;
-    
-    mFolderListing = new NmApiFolderListingPrivate(this);
-    mFolderListing->mIsRunning = false;
-    mFolderListing->mMailboxId = nmMailboxId;
+    mFolderListing = new NmApiFolderListingPrivate(mailboxId, this);
 }
 
 /*!
@@ -49,10 +41,6 @@
 NmApiFolderListing::~NmApiFolderListing()
 {
     NM_FUNCTION;
-    
-    if (mFolderListing->mIsRunning) {
-        mFolderListing->releaseEngine();
-    }
 }
 
 /*! 
@@ -65,14 +53,7 @@
 bool NmApiFolderListing::getFolders(QList<EmailClientApi::NmApiFolder> &folders)
 {
     NM_FUNCTION;
-    
-    folders.clear();
-    if (!mFolderListing->mIsRunning || mFolderListing->mFolders.isEmpty()) {
-        return false;
-    }
-    folders = mFolderListing->mFolders;
-    mFolderListing->mFolders.clear();
-    return true;
+    return mFolderListing->folders(folders);
 }
 
 /*!
@@ -91,20 +72,7 @@
 bool NmApiFolderListing::start()
 {
     NM_FUNCTION;
-    
-    if (mFolderListing->mIsRunning) {
-        return true;
-    }
-
-    if (!mFolderListing->initializeEngine()) {
-        QMetaObject::invokeMethod(this, "foldersListed", Qt::QueuedConnection, Q_ARG(qint32,
-            (qint32) FolderListingFailed));
-        return false;
-    }
-
-    qint32 folderCount = mFolderListing->grabFolders();
-
-    mFolderListing->mIsRunning = true;
+    qint32 folderCount = mFolderListing->listFolders();
     QMetaObject::invokeMethod(this, "foldersListed", Qt::QueuedConnection,
         Q_ARG(qint32, folderCount));
 
@@ -122,14 +90,7 @@
 {
     NM_FUNCTION;
     
-    if (!mFolderListing->mIsRunning) {
-        return;
-    }
-
-    mFolderListing->mIsRunning = false;
-    mFolderListing->releaseEngine();
-    mFolderListing->mFolders.clear();
-
+    mFolderListing->cancel(); 
     emit canceled();
 }
 
@@ -139,10 +100,9 @@
 bool NmApiFolderListing::isRunning() const
 {
     NM_FUNCTION;
-    
-    return mFolderListing->mIsRunning;
+    return mFolderListing->isRunning();
 }
 
 }
 
-#include "moc_nmapifolderlisting.cpp"
+