--- a/emailservices/nmclientapi/src/nmapiengine.cpp	Thu Sep 02 20:15:00 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapiengine.cpp	Fri Sep 17 08:27:21 2010 +0300
@@ -215,18 +215,18 @@
     NmDataPluginInterface *instance =  mFactory->interfaceInstance();
     if (instance) {
         instance->listMailboxes(mailboxFromPlugin);
-    }
-
-    while (mailboxFromPlugin.isEmpty() == false) {
-        NmMailbox* tempNmMailbox = mailboxFromPlugin.takeLast();
-
-        // subscribe all events also for these new mailboxes
-        instance->subscribeMailboxEvents(tempNmMailbox->id());
-
-        // construct mailboxlist to platform api
-        mailboxList << NmToApiConverter::NmMailbox2NmApiMailbox(*tempNmMailbox);
-
-        delete tempNmMailbox;
+        
+        while (mailboxFromPlugin.isEmpty() == false) {
+            NmMailbox* tempNmMailbox = mailboxFromPlugin.takeLast();
+    
+            // subscribe all events also for these new mailboxes
+            instance->subscribeMailboxEvents(tempNmMailbox->id());
+    
+            // construct mailboxlist to platform api
+            mailboxList << NmToApiConverter::NmMailbox2NmApiMailbox(*tempNmMailbox);
+    
+            delete tempNmMailbox;
+        }
     }
 }