diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index e4e0f9071..2727b4ba2 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -140,6 +140,11 @@
                          ng-click="$mdOpenMenu()"
                          md-menu-origin="md-menu-origin">more_vert</md-icon>
                 <md-menu-content width="2">
+                  <md-menu-item>
+                    <md-button type="button" ng-click="app.edit(folder)">
+                      <var:string label:value="Rename"/>
+                    </md-button>
+                  </md-menu-item>
                   <md-menu-item>
                     <md-button type="button" ng-click="app.confirmDelete()">
                       <var:string label:value="Delete"/>
@@ -205,6 +210,11 @@
                          ng-click="$mdOpenMenu()"
                          md-menu-origin="md-menu-origin">more_vert</md-icon>
                 <md-menu-content width="2">
+                  <md-menu-item>
+                    <md-button type="button" ng-click="app.edit(folder)">
+                      <var:string label:value="Rename"/>
+                    </md-button>
+                  </md-menu-item>
                   <md-menu-item>
                     <md-button type="button" ng-click="app.confirmDelete(folder)">
                       <var:string label:value="Delete"/>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index d98ae4992..fb807878c 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -287,12 +287,17 @@
                       <var:string label:value="New Subfolder..."/>
                     </md-button>
                   </md-menu-item>
+                  <md-menu-item ng-show="folder.$isEditable">
+                    <md-button type="button" ng-click="app.editFolder(folder)">
+                      <var:string label:value="Rename"/>
+                    </md-button>
+                  </md-menu-item>
                   <md-menu-item>
                     <md-button type="button" ng-click="app.compactFolder(folder)">
                       <var:string label:value="Compact"/>
                     </md-button>
                   </md-menu-item>
-                  <md-menu-item  ng-show="folder.$isEditable">
+                  <md-menu-item ng-show="folder.$isEditable">
                     <md-button type="button" ng-click="app.confirmDelete(folder)">
                       <var:string label:value="Delete"/>
                     </md-button>