Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 3149)
+++ /trunk/roundcubemail/CHANGELOG	(revision 3150)
@@ -2,4 +2,5 @@
 ===========================
 
+- Fix displaying nested message parts (#1486246)
 - Fix possible messages exposure when using Roundcube behind a proxy (#1486281)
 - Fix unicode para and line separators in javascript response (#1486310)
Index: /trunk/roundcubemail/program/include/rcube_message.php
===================================================================
--- /trunk/roundcubemail/program/include/rcube_message.php	(revision 3149)
+++ /trunk/roundcubemail/program/include/rcube_message.php	(revision 3150)
@@ -351,12 +351,11 @@
                  ($primary_type == 'message' && ($secondary_type == 'delivery-status' || $secondary_type == 'disposition-notification'))) {
 
-          // add text part if we're not in alternative mode or if it matches the prefs
-          if (!$this->parse_alternative ||
-              ($secondary_type == 'html' && $this->opt['prefer_html']) ||
+          // add text part if it matches the prefs
+          if (($secondary_type == 'html' && $this->opt['prefer_html']) ||
               ($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
             $mail_part->type = 'content';
             $this->parts[] = $mail_part;
           }
-
+          
           // list as attachment as well
           if (!empty($mail_part->filename))
Index: /trunk/roundcubemail/program/js/app.js
===================================================================
--- /trunk/roundcubemail/program/js/app.js	(revision 3149)
+++ /trunk/roundcubemail/program/js/app.js	(revision 3150)
@@ -3834,5 +3834,5 @@
         }
       else if (col == 'subject' && this.message_list)
-        this.message_list.subject_col = n+1;
+        this.message_list.subject_col = n;
       }
   };
Index: /trunk/roundcubemail/skins/default/mail.css
===================================================================
--- /trunk/roundcubemail/skins/default/mail.css	(revision 3149)
+++ /trunk/roundcubemail/skins/default/mail.css	(revision 3150)
@@ -973,5 +973,6 @@
 }
 
-div.message-part
+div.message-part,
+div.message-htmlpart
 {
   padding: 10px 8px;