From e2f30659a1bae74290df0e843bac5326cb05b79d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 14 Dec 2011 09:08:54 +0000
Subject: - Backported r5598:r5599 from trunk

---
 program/steps/mail/func.inc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index e51c2569b..503a56b00 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1046,6 +1046,11 @@ function rcmail_message_body($attrib)
   // list images after mail body
   if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) {
     foreach ($MESSAGE->attachments as $attach_prop) {
+      // skip inline images
+      if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
+        continue;
+      }
+
       // Content-Type: image/*...
       if (preg_match('/^image\//i', $attach_prop->mimetype) ||
         // ...or known file extension: many clients are using application/octet-stream
-- 
cgit v1.2.3