diff -r f83bd4ae1fe3 -r 10eaf342f539 emailservices/nmclientapi/src/nmapimailboxsettings_p.cpp
--- a/emailservices/nmclientapi/src/nmapimailboxsettings_p.cpp	Thu Jun 24 14:32:18 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapimailboxsettings_p.cpp	Tue Jun 29 17:12:28 2010 +0300
@@ -15,20 +15,8 @@
  *
  */
 
-#include "nmapimailboxsettings_p.h"
-
-#include "nmdataplugininterface.h"
-#include "nmapidatapluginfactory.h"
-//#include "nmapipopimapsettingsmanager.h"
-#include "emailtrace.h"
+#include "nmapiheaders.h"
 
-#include <nmapimailboxsettings.h>
-#include <nmapimailboxsettingsdata.h>
-
-#include <QVariant>
-#include <QString>
-#include <QHash>
-#include <QList>
 
 namespace EmailClientApi
 {
@@ -93,7 +81,8 @@
     NmApiMailboxSettingsData &data)
 {
     NM_FUNCTION;
-    
+    Q_UNUSED(mailboxType);
+    Q_UNUSED(data);
     bool ret = false;
     
     /*QT_TRY {
@@ -140,6 +129,8 @@
     const QString &mailboxType, NmApiMailboxSettingsData &data) 
 {
     NM_FUNCTION;
+    Q_UNUSED(mailboxType);
+    Q_UNUSED(data);
     /*QScopedPointer<NmApiPopImapSettingsManager> popImapManager(new NmApiPopImapSettingsManager());  
     return popImapManager->populateDefaults(mailboxType, data);*/
     return true;