diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 7356a8f76..78df0c8a4 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -54,8 +54,10 @@
 "Share" = "Share";
 "Account" = "Account";
 "Shared Account" = "Shared Account";
-/* Empty right pane */
+/* A mailbox is selected, but no message (only shown on large screens) */
 "No message selected" = "No message selected";
+/* No mailbox is selected (usually resulting from an IMAP connection problem) */
+"No mailbox selected" = "No mailbox selected";
 /* acls */
 "Access rights to" = "Access rights to";
 "For user" = "For user";
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 452eec7d1..b1e2a7055 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -188,7 +188,17 @@
       </md-content>
     </md-sidenav>
 
-    <section layout="column" class="layout-fill" ui-view="mailbox"><!-- messages list --></section>
+    <section layout="column" class="layout-fill" ui-view="mailbox">
+      <md-toolbar layout="row" layout-align="space-between center" class="toolbar-main">
+        <var:component className="UIxTopnavToolbarTemplate"/>
+      </md-toolbar>
+      <md-content class="md-flex layout-fill md-hue-1"
+                  layout="column" layout-align="center center">
+        <div class="md-default-theme md-background md-fg md-hue-3 sg-md-title">
+          <var:string label:value="No mailbox selected"/>
+        </div>
+      </md-content>
+    </section>
   </script>
 
   <script type="text/ng-template" id="UIxMailFolderTemplate">
diff --git a/UI/WebServerResources/js/Mailer/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
index dd4c0f888..88727c5e7 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.app.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.app.js
@@ -16,7 +16,6 @@
     $stateProvider
       .state('mail', {
         url: '/Mail',
-        abstract: true,
         views: {
           mailboxes: {
             templateUrl: 'UIxMailMainFrame', // UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -326,7 +325,11 @@
   function runBlock($rootScope, $log, $state) {
     $rootScope.$on('$stateChangeError', function(event, toState, toParams, fromState, fromParams, error) {
       $log.error(error);
-      $state.go('mail');
+      event.preventDefault();
+      if (toState.name != 'mail.account.inbox')
+        $state.go('mail.account.inbox');
+      else
+        $state.go('mail');
     });
     $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
       $log.error(event, current, previous, rejection);