diff -r 4e54af54a4a1 -r 6c59112cfd31 emailservices/nmclientapi/src/nmapisettingsmanager.cpp
--- a/emailservices/nmclientapi/src/nmapisettingsmanager.cpp	Wed Sep 15 17:47:19 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapisettingsmanager.cpp	Thu Sep 30 11:43:07 2010 +0300
@@ -14,22 +14,22 @@
  * Description:
  *
  */
-#include <nmapisettingsmanager.h>
-#include "nmapisettingsmanager_p.h"
-#include "nmapiheaders.h"
+#include <nmapiheaders.h>
 
 namespace EmailClientApi
 {
 
 NmApiSettingsManager::NmApiSettingsManager(const quint64 mailboxId)
 {    
-    d = new NmApiSettingsManagerPrivate(mailboxId);
+    Q_UNUSED(mailboxId);
+    d = new NmApiSettingsManagerPrivate();
 }
 
 NmApiSettingsManager::~NmApiSettingsManager()
 {    
     delete d;
 }
+
 /*!     
  Loads email settings.
  \param mailboxId which settings are returned
@@ -48,7 +48,7 @@
  */
 bool NmApiSettingsManager::save(const NmApiMailboxSettingsData &data)
 {
-    return d->save(data);
+    return d->save(data.mailboxId(), data);
 }
 
 } // end namespace