diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 56415dab6..ad7a40f33 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -2335,7 +2335,6 @@ define([
                 initAnonRpc(null, null, waitFor());
                 initRpc(null, null, waitFor());
             }).nThen(function (waitFor) {
-                loadMailbox(waitFor);
                 Migrate(proxy, waitFor(), function (version, progress) {
                     postMessage(clientId, 'LOADING_DRIVE', {
                         state: (2 + (version / 10)),
@@ -2355,6 +2354,7 @@ define([
                 loadUniversal(Profile, 'profile', waitFor);
                 loadUniversal(Team, 'team', waitFor);
                 loadUniversal(History, 'history', waitFor);
+                loadMailbox(waitFor); // XXX make sure we don't have new issues with mailboxes being loaded later
                 cleanFriendRequests();
             }).nThen(function () {
                 var requestLogin = function () {