diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index dab826b9f..f2dc88dc5 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -189,16 +189,22 @@
                 <md-menu-content width="4">
                   <div ng-repeat="account in mailbox.accounts track by account.id">
                     <md-menu-item>
-                      <md-button class="md-primary" ng-disabled="true">{{account.name}}</md-button>
-                    </md-menu-item>
-                    <md-menu-divider><!-- divider --></md-menu-divider>
-                    <md-menu-item ng-repeat="folder in
-                                             account.$flattenMailboxes({ all: true })
-                                             track by folder.path"
-                                  ng-hide="mailbox.id == folder.id">
-                      <md-button ng-click="mailbox.copySelectedMessages(folder.id)">
-                        <span ng-class="'sg-child-level-' + folder.level">{{folder.name}}</span>
-                      </md-button>
+                      <md-menu>
+                        <md-button class="md-primary" ng-click="$mdOpenMenu($event)">{{account.name}}</md-button>
+                        <md-menu-content class="md-dense" width="4">
+                          <div ng-repeat="folder in
+                                          account.$flattenMailboxes({ all: true })
+                                          track by folder.path">
+                            <md-menu-item>
+                              <md-button class="sg-no-wrap"
+                                         ng-disabled="mailbox.service.selectedFolder.id == folder.id"
+                                         ng-click="mailbox.copySelectedMessages(folder.id)">
+                                <span ng-class="'sg-child-level-' + folder.level">{{folder.name}}</span>
+                              </md-button>
+                            </md-menu-item>
+                          </div>
+                        </md-menu-content>
+                      </md-menu>
                     </md-menu-item>
                   </div>
                 </md-menu-content>
@@ -212,16 +218,22 @@
                 <md-menu-content width="4">
                   <div ng-repeat="account in mailbox.accounts track by account.id">
                     <md-menu-item>
-                      <md-button class="md-primary" ng-disabled="true">{{account.name}}</md-button>
-                    </md-menu-item>
-                    <md-menu-divider><!-- divider --></md-menu-divider>
-                    <md-menu-item ng-repeat="folder in
-                                             account.$flattenMailboxes({ all: true })
-                                             track by folder.path"
-                                  ng-hide="mailbox.id == folder.id">
-                      <md-button ng-click="mailbox.moveSelectedMessages(folder.id)">
-                        <span ng-class="'sg-child-level-' + folder.level">{{folder.name}}</span>
-                      </md-button>
+                      <md-menu>
+                        <md-button class="md-primary" ng-click="$mdOpenMenu($event)">{{account.name}}</md-button>
+                        <md-menu-content class="md-dense" width="4">
+                          <div ng-repeat="folder in
+                                          account.$flattenMailboxes({ all: true })
+                                          track by folder.path">
+                            <md-menu-item>
+                              <md-button class="sg-no-wrap"
+                                         ng-disabled="mailbox.service.selectedFolder.id == folder.id"
+                                         ng-click="mailbox.moveSelectedMessages(folder.id)">
+                                <span ng-class="'sg-child-level-' + folder.level">{{folder.name}}</span>
+                              </md-button>
+                            </md-menu-item>
+                          </div>
+                        </md-menu-content>
+                      </md-menu>
                     </md-menu-item>
                   </div>
                 </md-menu-content>