diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index 4e29690ba..41e81f3de 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -166,7 +166,7 @@
               </md-menu-item>
               <md-menu-divider><!-- divider --></md-menu-divider>
               <md-menu-item ng-repeat="folder in
-                                       account.$flattenMailboxes()
+                                       account.$flattenMailboxes({ all: true })
                                        track by folder.path"
                             ng-hide="mailbox.id == folder.id">
                 <md-button ng-click="mailbox.copySelectedMessages(folder.id)">
diff --git a/UI/WebServerResources/js/Mailer/Account.service.js b/UI/WebServerResources/js/Mailer/Account.service.js
index 70e528c64..e8f62ff30 100644
--- a/UI/WebServerResources/js/Mailer/Account.service.js
+++ b/UI/WebServerResources/js/Mailer/Account.service.js
@@ -160,15 +160,17 @@
     }
     else {
       _visit(this.$mailboxes);
-      _this.$$flattenMailboxes = allMailboxes;
-      if (options && options.saveState) {
-        _.reduce(allMailboxes, function(expandedFolders, mailbox) {
-          if (mailbox.$expanded) {
-            expandedFolders.push('/' + mailbox.id);
-          }
-          return expandedFolders;
-        }, expandedMailboxes);
-        Account.$$resource.post(null, 'saveFoldersState', expandedMailboxes);
+      if (!options || !options.all) {
+        _this.$$flattenMailboxes = allMailboxes;
+        if (options && options.saveState) {
+          _.reduce(allMailboxes, function(expandedFolders, mailbox) {
+            if (mailbox.$expanded) {
+              expandedFolders.push('/' + mailbox.id);
+            }
+            return expandedFolders;
+          }, expandedMailboxes);
+          Account.$$resource.post(null, 'saveFoldersState', expandedMailboxes);
+        }
       }
     }