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

Conflicts:

	CHANGELOG

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7c15aafe3..dbc7447ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail
 
 - After message is sent refresh messages list of replied message folder (#1489249)
 - Add option force specified domain in user login - username_domain_forced (#1489264)
+- 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)
 - Add option to import Vcards with group assignments
 - Save groups membership in Vcard export (#1488509)
diff --git a/program/js/app.js b/program/js/app.js
index 166b082bf..42c661144 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1784,7 +1784,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' : ''),
       row = { cols:[], style:{}, id:'rcmrow'+uid };
 
@@ -1834,6 +1833,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>';