summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-17 11:32:07 +0200
committerAleksander Machniak <alec@alec.pl>2012-10-17 11:32:07 +0200
commitca914007258b64229c9cea7d49c8dc9e6b178d12 (patch)
tree1b105b58014ca41089c4494700e4e288c8b5683f
parent38b6aac6042311bbf95c0492f4083eb25b12b72e (diff)
parent5fbfde8fdf53d54dbaf7883c10ed275ebe3a921c (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/include/rcube_message.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 7bf95d1c5..4e1b5a0c2 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -371,9 +371,10 @@ class rcube_message
foreach ($structure->parts as $p => $sub_part) {
$sub_mimetype = $sub_part->mimetype;
- // skip empty parts
- if (!$sub_part->size)
+ // skip empty text parts
+ if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) {
continue;
+ }
// check if sub part is
if ($sub_mimetype == 'text/plain')