diff --git a/NEWS b/NEWS
index 1770ec45e..6f2e27f28 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Enhancements
 Bug fixes
  - don't load 'background' attribute (#2437)
  - fixed validation of subscribed folders (#2583)
+ - fixed display of folder names in messages filter editor (#2569)
 
 2.1.1b (2013-12-04)
 -------------------
diff --git a/UI/WebServerResources/UIxFilterEditor.js b/UI/WebServerResources/UIxFilterEditor.js
index 16f74b7ca..a4ce4ac93 100644
--- a/UI/WebServerResources/UIxFilterEditor.js
+++ b/UI/WebServerResources/UIxFilterEditor.js
@@ -663,12 +663,12 @@ function ensureMailboxArgRepresentation(container, argumentSpan) {
         select.observe("change", boundCB);
         var mailboxes = (window.opener
                          ? window.opener.userMailboxes
-                         : ["INBOX" ]);
+                         : {'displayName': 'INBOX', 'path': 'INBOX' });
         for (var i = 0; i < mailboxes.length; i++) {
             var mailbox = mailboxes[i];
             var mboxOption = createElement("option", null, null,
-                                           { value: mailbox }, null, select);
-            mboxOption.appendChild(document.createTextNode(mailbox));
+                                           { value: mailbox.path }, null, select);
+            mboxOption.appendChild(document.createTextNode(mailbox.displayName));
         }
         argumentSpan.appendChild(select);
     }
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 6b0761912..e1a8880ce 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -448,8 +448,9 @@ function setupMailboxesFromJSON(jsonResponse) {
     var responseMboxes = jsonResponse.mailboxes;
     userMailboxes = $([]);
     for (var i = 0; i < responseMboxes.length; i++) {
-        var name = responseMboxes[i].path.substr(1);
-        userMailboxes.push(name);
+        var mbox = { 'displayName': responseMboxes[i].displayName.substr(1),
+                     'path': responseMboxes[i].path.substr(1) };
+        userMailboxes.push(mbox);
     }
 }