Archive: Fix missing Archive icon in folder selector popup in Elastic

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index 12f519a4c..0975dff07 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -66,16 +66,16 @@ if (window.rcmail) {
       else
         li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true);
 
-      if (li) {
+      if (li)
         $(li).addClass('archive');
 
-        // in folder selector popup
-        rcmail.addEventListener('menu-open', function(p) {
-          if (p.name == 'folder-selector') {
-            $('a[rel="' + $('a', li).attr('rel') + '"]', p.obj).parent().addClass('archive');
-          }
-        });
-      }
+      // in folder selector popup
+      rcmail.addEventListener('menu-open', function(p) {
+        if (p.name == 'folder-selector') {
+          var search = rcmail.env.archive_folder;
+          $('a', p.obj).filter(function() { return $(this).data('id') == search; }).parent().addClass('archive');
+        }
+      });
     }
   });
 }