Thomas Bruederli
2013-10-21 f06aa8058b7e32ba32d4551074b6e0b8a300f751
program/include/rcube_message.php
@@ -211,7 +211,18 @@
                    // HTML part can be on the lower level, if not...
                    if (count($level) > 1) {
                        // It can be an alternative or related message part
                        $parent = $this->mime_parts[0];
                        // find parent part
                        $parent = null;
                        foreach ($this->mime_parts as $part) {
                            if ($part->mime_id == $level[0]) {
                                $parent = $part;
                            }
                        }
                        if (!$parent) {
                            continue;
                        }
                        if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
                            continue;
                        }
@@ -364,9 +375,10 @@
            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')