diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 5f3068a7c..3110ea930 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -267,7 +267,16 @@
       <var:component className="UIxSidenavToolbarTemplate" />
       <md-content md-scroll-y="md-scroll-y" class="md-flex">
         <section ng-repeat="account in accounts track by account.id">
-          <md-subheader class="sg-md-subheader md-padding">{{account.name}}</md-subheader>
+          <md-subheader class="sg-md-subheader">
+            <div layout="row" layout-align="space-between center">
+              <span>{{account.name}}</span>
+              <md-button class="iconButton"
+                         label:aria-label="New Folder..."
+                         ng-click="newFolder(account)">
+                <i class="md-icon-add-circle-outline"><!-- add --></i>
+              </md-button>
+            </div>
+          </md-subheader>
           <md-list>
             <md-list-item ng-repeat="folder in account.$flattenMailboxes() track by folder.path"
                           ng-click="selectFolder(account, folder)"
diff --git a/UI/WebServerResources/js/MailerUI.js b/UI/WebServerResources/js/MailerUI.js
index 7cbbf8390..30b91c911 100644
--- a/UI/WebServerResources/js/MailerUI.js
+++ b/UI/WebServerResources/js/MailerUI.js
@@ -180,9 +180,7 @@
         Dialog.prompt(l('New folder'),
                       l('Enter the new name of your folder :'))
           .then(function(name) {
-            if (name && name.length > 0) {
-              parentFolder.$newMailbox(parentFolder.id, name);
-            }
+            parentFolder.$newMailbox(parentFolder.id, name);
           });
       };
       $scope.editFolder = function(folder) {