From 1f9ac5c18f4daaae6ffe62aaa02dfd9d8725606e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 2 Nov 2017 19:26:39 +0100
Subject: [PATCH] Style Archive folder (icon) also in folder selector

---
 plugins/archive/archive.js | 12 +++++++++++-
 program/js/app.js          |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index a9b3092d6..6ae93fac0 100644
--- a/plugins/archive/archive.js
+++ b/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');
+          }
+        });
+      }
     }
   });
 }
diff --git a/program/js/app.js b/program/js/app.js
index dc098a2a4..09437125d 100644
--- a/program/js/app.js
+++ b/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)