diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index 0ca076747..7251a50cc 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -40,7 +40,7 @@
       if (Mailbox.$virtualMode)
         $state.go('mail.account.virtualMailbox.message', {accountId: stateAccount.id, mailboxId: encodeUriFilter(message.$mailbox.path), messageId: message.uid});
       else
-        $state.go('mail.account.mailbox.message', {accountId: stateAccount.id, mailboxId: encodeUriFilter(message.$mailbox.path), messageId: message.uid});
+        $state.go('mail.account.mailbox.message', {messageId: message.uid});
     }
 
     function toggleMessageSelection($event, message) {
diff --git a/UI/WebServerResources/js/Mailer/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
index 544b82815..81031ab60 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.app.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.app.js
@@ -69,17 +69,7 @@
       })
       .state('mail.account.inbox', {
         url: '/inbox',
-        views: {
-          'mailbox@mail': {
-            templateUrl: 'UIxMailFolderTemplate', // UI/Templates/MailerUI/UIxMailFolderTemplate.wox
-            controller: 'MailboxController',
-            controllerAs: 'mailbox'
-          }
-        },
-        resolve: {
-          stateMailbox: stateInbox,
-          stateMessages: stateMessages
-        }
+        onEnter: onEnterInbox
       })
       .state('mail.account.mailbox', {
         url: '/:mailboxId',
@@ -219,12 +209,11 @@
   /**
    * @ngInject
    */
-  stateInbox.$inject = ['stateAccount', 'Mailbox'];
-  function stateInbox(stateAccount, Mailbox) {
-    if (Mailbox.selectedFolder)
-      Mailbox.selectedFolder.$isLoading = true;
-
-    return stateAccount.$mailboxes[0];
+  onEnterInbox.$inject = ['$window', '$state', 'encodeUriFilter', 'stateAccount'];
+  function onEnterInbox($window, $state, encodeUriFilter, stateAccount) {
+    $window.location.hash = $state.href('mail.account.mailbox',
+                                        {accountId: stateAccount.id,
+                                         mailboxId: encodeUriFilter(stateAccount.$mailboxes[0].path)});
   }
 
   /**