Fix expanded thread root message styling after refreshing messages list (#1489327)

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a2ef913ef..d21bf9aa8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix expanded thread root message styling after refreshing messages list (#1489327)
 - Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
 - Fix error_reporting directive check (#1489323)
 - Fix de_DE localization of "About" label in Help plugin (#1489325)
diff --git a/program/js/app.js b/program/js/app.js
index c99dc7edb..337875431 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1786,7 +1786,6 @@ function rcube_webmail()
         + (!flags.seen ? ' unread' : '')
         + (flags.deleted ? ' deleted' : '')
         + (flags.flagged ? ' flagged' : '')
-        + (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
         + (message.selected ? ' selected' : ''),
       // for performance use DOM instead of jQuery here
       row = document.createElement('tr');
@@ -1839,6 +1838,9 @@ function rcube_webmail()
         expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">&nbsp;&nbsp;</div>';
         row_class += ' thread' + (message.expanded? ' expanded' : '');
       }
+
+      if (flags.unread_children && flags.seen && !message.expanded)
+        row_class += ' unroot';
     }
 
     tree += '<span id="msgicn'+uid+'" class="'+css_class+'">&nbsp;</span>';