diff --git a/src/js/app-controller.js b/src/js/app-controller.js
index b629381..ba358e0 100644
--- a/src/js/app-controller.js
+++ b/src/js/app-controller.js
@@ -221,11 +221,13 @@ define(function(require) {
                 return;
             }
 
-            credentials.imap.maxUpdateSize = config.imapUpdateBatchSize;
             initClients(credentials);
         });
 
         function initClients(credentials) {
+            // add the maximum update batch size for imap folders to the imap configuration
+            credentials.imap.maxUpdateSize = config.imapUpdateBatchSize;
+
             var pgpMailer = new PgpMailer(credentials.smtp, self._pgpbuilder);
             var imapClient = new ImapClient(credentials.imap);
             imapClient.onError = onConnectionError;