Fixed a small bug I introduced in the threading patches where an expanded message would show a collapsed icon.

1 files changed, 8 insertions, 6 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index e6c7aebdb..1552bb568 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -3631,7 +3631,7 @@ function rcube_webmail()
 
     var icon = this.env.messageicon;
     if (!flags.unread && unread_children > 0 && this.env.unreadchildrenicon)
-      icon = this.env.unreadchildrenicon;
+      icon = '<img src="' + this.env.unreadchildrenicon + '" alt="" />';
     else if (flags.deleted && this.env.deletedicon)
       icon = this.env.deletedicon;
     else if (flags.replied && this.env.repliedicon)
@@ -3651,8 +3651,8 @@ function rcube_webmail()
       {
       for (var i=1;i<depth;i++)
         tree += '<div class="branch">&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>';
+      var toggle_exp = (message.unread_children > 0 || message.expanded) ? 'expanded' : 'collapsed';
+      tree += flags.has_children?'<div id="rcmexpando' + uid + '" class="' + toggle_exp + '">&nbsp;</div>':'<div class="leaf">&nbsp;</div>';
       if (depth > 1)
         {
         if (message.unread_children > 0 || message.unread)
@@ -3678,13 +3678,15 @@ function rcube_webmail()
           html = this.env.flaggedicon;
         else if(!flags.flagged)
           html = this.env.unflaggedicon;
-      }
+        }
       else if (c=='attachment')
         html = attachment ? this.env.attachmenticon : '&nbsp;';
       else
         html = cols[c];
-	  if (n == 0)
-	    html = tree + html;
+
+      if (n == 0)
+        html = tree + html;
+
       col.innerHTML = html;
 
       row.appendChild(col);