diff --git a/NEWS b/NEWS
index 4ee6daf1f..59fe4397a 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bug fixes
  - fixed timezone of MSExchange freebusy information
  - fixed a potential EAS error with multiple email priority flags
  - fixed paragraphs margins in HTML messages (#3163)
+ - fixed regression when loading the inbox for the first time
 
 2.2.17a (2015-03-15)
 --------------------
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 995a11f9c..1941ed32b 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -916,10 +916,11 @@ function openMailbox(mailbox, reload) {
                     dataSource.init(inboxData['uids'], inboxData['threaded'], inboxData['headers'], inboxData['quotas']);
                     inboxData = null; // invalidate this initial lookup
                 }
-                else
+                else {
                     // Fetch UIDs and headers from server
                     var content = Object.toJSON(urlParams);
                     dataSource.load(content);
+                }
                 // Cache data source
                 Mailer.dataSources.set(key, dataSource);
                 // Update unseen count