From 28fb0cdc06692380b2bf3370a3479f180d12678d Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 23 Nov 2016 12:23:11 +0100 Subject: [PATCH] Fix inline forward an email from draft folder does not include attachments --- mail/inc/class.mail_compose.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 3dd748f521..099dd63d51 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -1751,7 +1751,7 @@ class mail_compose if(($attachments = $mail_bo->getMessageAttachments($_uid,$_partID))) { //error_log(__METHOD__.__LINE__.':'.array2string($attachments)); foreach($attachments as $attachment) { - if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType']))) + if (!($attachment['cid'] && preg_match("/image\//",$attachment['mimeType'])) || $attachment['disposition'] == 'attachment') { $this->addMessageAttachment($_uid, $attachment['partID'], $_folder,