diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 981e8ace9..b9c6a0234 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -255,14 +255,14 @@
                                 ng-class="{ 'md-warn': account.$quota.percent > 70 }"
                                 value="{{account.$quota.percent}}"><!-- quota --></md-progress-linear>
             <div class="sg-md-caption md-default-theme md-fg md-primary"
-                 ng-class="{ 'md-warn': account.$quota.percent > 70 }">{{ account.$quota.description }}</div>
+                 ng-class="{ 'md-warn': account.$quota.percent > 70 }">{{account.$quota.description}}</div>
           </div>
           <md-virtual-repeat-container class="md-flex">
             <md-list>
               <md-list-item md-virtual-repeat="folder in account.$flattenMailboxes()" md-item-size="48"
-                            ng-dblclick="app.editFolder(folder)"
-                            ui-sref="mail.account.mailbox({accountId: account.id, mailboxId: (folder.path | encodeUri)})"
-                            ui-sref-active="md-default-theme md-background md-bg md-hue-1">
+                            class="md-default-theme md-background md-hue-1"
+                            ng-class="{'md-bg': folder.path == app.service.selectedFolder.path}"
+                            ng-dblclick="app.editFolder(folder)">
                 <div ng-class="'sg-child-level-' + folder.level">
                   <md-icon ng-hide="folder.children.length">{{app.metadataForFolder(folder).icon}}</md-icon>
                   <md-checkbox class="sg-folder"
@@ -272,7 +272,7 @@
                                ng-change="account.$flattenMailboxes({ reload: true, saveState: true })"><!-- expanded --></md-checkbox>
                 </div>
                 <p class="sg-item-name"
-                   ng-click="app.selectFolder(account, folder)"
+                   ng-click="app.selectFolder($event, account, folder)"
                    ng-show="app.editMode != folder.path">
                   {{app.metadataForFolder(folder).name}}
                   <span class="sg-counter-badge" ng-show="folder.unseenCount">{{folder.unseenCount}}</span>
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index 680221291..d0019a712 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -215,7 +215,7 @@
       vm.editMode = false;
     }
 
-    function selectFolder(account, folder) {
+    function selectFolder($event, account, folder) {
       if (vm.editMode == folder.path)
         return;
       vm.editMode = false;
@@ -225,6 +225,8 @@
       if ($mdMedia('xs'))
         $mdSidenav('left').close();
       $state.go('mail.account.mailbox', { accountId: account.id, mailboxId: encodeUriFilter(folder.path) });
+      $event.stopPropagation();
+      $event.preventDefault();
     }
 
     function saveFolder(folder) {