From aafc0a3d24149da9f7350f760932898319041815 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 7 Jun 2013 13:39:26 +0200
Subject: Fix so non-inline images aren't skipped on forward (#1489150)

Conflicts:

	CHANGELOG
---
 program/steps/mail/compose.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 47dfa52ce..9e1b727ae 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1008,8 +1008,8 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
       if ($part->ctype_primary == 'message' && $compose_mode == RCUBE_COMPOSE_REPLY) {
         continue;
       }
-      // skip inline images when forwarding in plain text
-      if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
+      // skip inline images when forwarding
+      if ($part->content_id && $part->disposition == 'inline' && $compose_mode == RCUBE_COMPOSE_FORWARD) {
         continue;
       }
 
-- 
cgit v1.2.3