From 84dfbf541f66a552e9f2d21dbc717df493f0a3b2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 9 Jul 2012 12:19:38 +0200
Subject: - Don't add attachments content into reply/forward/draft message body
 (#1488557)

---
 program/steps/mail/compose.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'program/steps')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 8152f5dca..8a4715715 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -632,7 +632,8 @@ function rcmail_prepare_message_body()
 
     if (!empty($MESSAGE->parts)) {
       foreach ($MESSAGE->parts as $part) {
-        if ($part->type != 'content' || !$part->size) {
+        // skip no-content and attachment parts (#1488557)
+        if ($part->type != 'content' || !$part->size || $MESSAGE->is_attachment($part)) {
           continue;
         }
 
-- 
cgit v1.2.3