Change-set to let the IMAP server do the sensible sorting of threads i.e. sort threads by newest in-thread messages rather than simply by the root thread message.

1 files changed, 9 insertions, 2 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 626756af6..9c0fafed9 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -3655,9 +3655,16 @@ function rcube_webmail()
       {
       for (var i=1;i<depth;i++)
         tree += '<div class="branch">&nbsp</div>';
-      tree += flags.has_children?'<div id="rcmexpando' + uid + '" class="' + (message.expanded?'expanded':'collapsed') + '">&nbsp;</div>':'<div class="leaf">&nbsp;</div>';
+      var toggle_exp = (message.unread_children > 0) ? 'expanded' : 'collapsed';
+        tree += flags.has_children?'<div id="rcmexpando' + uid + '" class="' + toggle_exp + '">&nbsp;</div>':'<div class="leaf">&nbsp;</div>';
+      //tree += flags.has_children?'<div id="rcmexpando' + uid + '" class="' + (message.expanded?'expanded':'collapsed') + '">&nbsp;</div>':'<div class="leaf">&nbsp;</div>';
       if (depth > 1)
-        row.style.display = 'none';
+        {
+        if (message.unread_children > 0 || message.unread)
+          row.style.display = '';
+        else 
+          row.style.display = 'none';
+        }
       }
     
     tree += icon ? '<img src="'+icon+'" alt="" />' : '';