Fix HTML part detection in messages with attachments (#1488769)

1 files changed, 12 insertions, 1 deletions

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 60e79cb97..683a395d9 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -211,7 +211,18 @@ class rcube_message
                     // 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;
                         }