diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index baeb0491c..d4bd22bb3 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -291,7 +291,7 @@
                       <var:string label:value="Compact"/>
                     </md-button>
                   </md-menu-item>
-                  <md-menu-item>
+                  <md-menu-item  ng-show="folder.$isEditable()">
                     <md-button type="button" ng-click="app.confirmDelete(folder)">
                       <var:string label:value="Delete"/>
                     </md-button>
@@ -306,13 +306,13 @@
                       <var:string label:value="Export"/>
                     </md-button>
                   </md-menu-item>
-                  <md-menu-divider><!-- divider --></md-menu-divider>
                   <!-- <md-menu-item>
                     <md-button type="button" ng-click="TODO">
                       <var:string label:value="Use This Folder For"/>
                     </md-button>
-                  </md-menu-item> -->
-                  <md-menu-item>
+                    </md-menu-item> -->
+                  <md-menu-divider ng-show="folder.type != 'additional'"><!-- divider --></md-menu-divider>
+                  <md-menu-item ng-show="folder.type != 'additional'">
                     <md-button type="button" ng-click="app.share(folder)">
                       <var:string label:value="Sharing..."/>
                     </md-button>
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index e2a0c162e..0f317b2f4 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -258,7 +258,7 @@
    * @returns true if the mailbox is not a special folder.
    */
   Mailbox.prototype.$isEditable = function() {
-    return _.contains(['folder', 'inbox', 'draft', 'sent', 'trash'], this.type);
+    return this.type == 'folder';
   };
 
   /**