Style Archive folder (icon) also in folder selector

plugins/archive/archive.js

@@ -58,13 +58,23 @@ if (window.rcmail) {
     // set css style for archive folder
     var li;
     if (rcmail.env.archive_folder) {
+      // in Settings > Folders
       if (rcmail.subscription_list)
         li = rcmail.subscription_list.get_item(rcmail.env.archive_folder);
+      // in folders list
       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');
+          }
+        });
+      }
     }
   });
 }

program/js/app.js

@@ -8152,7 +8152,7 @@ function rcube_webmail()
         var n = 0, s = 0,
           folder = ref.env.mailboxes[this],
           id = folder.id,
-          a = $(link.cloneNode(false)),
+          a = $(link.cloneNode(false)).attr('rel', folder.id),
           row = $('<li>');
 
         if (folder.virtual)