diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 51b1ae6f0..afa838b4c 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -359,25 +359,25 @@
                 <md-menu-item>
                   <md-button ng-click="mailbox.sort('subject')">
                     <md-icon ng-class="{ 'icon-check': mailbox.sortedBy('subject') }">
-                      <!-- selected --></md-icon> <var:string label:value="Subject"/>
+                      <!-- subject --></md-icon> <var:string label:value="Subject"/>
                   </md-button>
                 </md-menu-item>
                 <md-menu-item>
                   <md-button ng-click="mailbox.sort('from')">
                     <md-icon ng-class="{ 'icon-check': mailbox.sortedBy('from') }">
-                      <!-- selected --></md-icon> <var:string label:value="From"/>
+                      <!-- from --></md-icon> <var:string label:value="From"/>
                   </md-button>
                 </md-menu-item>
                 <md-menu-item>
                   <md-button ng-click="mailbox.sort('date')">
                     <md-icon ng-class="{ 'icon-check': mailbox.sortedBy('date') }">
-                      <!-- selected --></md-icon> <var:string label:value="Date"/>
+                      <!-- date --></md-icon> <var:string label:value="Date"/>
                   </md-button>
                 </md-menu-item>
                 <md-menu-item>
                   <md-button ng-click="mailbox.sort('size')">
                     <md-icon ng-class="{ 'icon-check': mailbox.sortedBy('size') }">
-                      <!-- selected --></md-icon> <var:string label:value="Size"/>
+                      <!-- size --></md-icon> <var:string label:value="Size"/>
                   </md-button>
                 </md-menu-item>
                 <md-menu-divider> <!-- divider --></md-menu-divider>
@@ -421,7 +421,10 @@
         <md-button class="sg-icon-button" ng-click="mailbox.unselectMessages()">
           <md-icon>arrow_back</md-icon>
         </md-button>
-        <label>{{mailbox.$selectedCount()}} selected</label>
+        <label>{{mailbox.selectedFolder.$selectedCount()}} selected</label>
+        <md-button class="sg-icon-button" ng-click="mailbox.selectAll()">
+          <md-icon>select_all</md-icon>
+        </md-button>
         <md-button class="sg-icon-button" ng-click="mailbox.confirmDeleteSelectedMessages()">
           <md-icon>delete</md-icon>
         </md-button>
diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js
index b1bcfd579..103ddbdc9 100644
--- a/UI/WebServerResources/js/Mailer/MailboxController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxController.js
@@ -21,6 +21,7 @@
     vm.confirmDeleteSelectedMessages = confirmDeleteSelectedMessages;
     vm.copySelectedMessages = copySelectedMessages;
     // vm.moveSelectedMessages = moveSelectedMessages;
+    vm.selectAll = selectAll;
     vm.sort = sort;
     vm.sortedBy = sortedBy;
     vm.cancelSearch = cancelSearch;
@@ -68,6 +69,12 @@
     //   });
     // }
 
+    function selectAll() {
+      _.each(vm.selectedFolder.$messages, function(message) {
+        message.selected = true;
+      });
+    }
+
     function sort(field) {
       vm.selectedFolder.$filter({ sort: field });
     }