#1485616: read content-id/content-location only for multipart/related type

program/include/rcube_message.php

@@ -374,15 +374,17 @@ class rcube_message
           if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
             continue;
 
-          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id'])
+          // part belongs to a related message
+          if ($message_ctype_secondary == 'related') {
+            if ($mail_part->headers['content-id'])
               $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
-          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])
+            if ($mail_part->headers['content-location'])
               $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
             
-          // part belongs to a related message
 	    if ($mail_part->content_id || $mail_part->content_location) {
               $this->inline_parts[] = $mail_part;
             }
+	  }
           // is regular attachment
           else {
             if (!$mail_part->filename)