- if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) {
- $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
- $this->inline_parts[] = $mail_part;
- }
+ if ($message_ctype_secondary == 'related') {
+ if ($mail_part->headers['content-id'])
+ $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
+ if ($mail_part->headers['content-location'])
+ $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+
+ if ($mail_part->content_id || $mail_part->content_location) {
+ $this->inline_parts[] = $mail_part;
+ }
+ }