summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-12-03 09:54:38 +0000
committeralecpl <alec@alec.pl>2009-12-03 09:54:38 +0000
commit3815e050e0e0ddafb919741426f3c36ebdadb9a8 (patch)
tree684af47f5857f086e71d67f02919057e20936146 /program
parent6d13ca184657383caf4a9fca19806f31a17318f1 (diff)
- Fix displaying nested message parts (#1486246)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_message.php7
-rw-r--r--program/js/app.js2
2 files changed, 4 insertions, 5 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 1a22427d0..0b6fbb1e9 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -350,14 +350,13 @@ class rcube_message
else if (($primary_type == 'text' && ($secondary_type == 'plain' || $secondary_type == 'html') && $mail_part->disposition != 'attachment') ||
($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))
$this->attachments[] = $mail_part;
diff --git a/program/js/app.js b/program/js/app.js
index 4c8daeed2..1f0b35243 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3833,7 +3833,7 @@ function rcube_webmail()
cell.id = 'rcm'+col;
}
else if (col == 'subject' && this.message_list)
- this.message_list.subject_col = n+1;
+ this.message_list.subject_col = n;
}
};