From 22819a30818e9968ae707bf7fbbe9e108c7880d4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 28 Feb 2013 22:03:40 +0100
Subject: [PATCH] Don't skip message/* attachments when opening a draft.
 Restore check as it was before [fa57c988]

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

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 74c6d5f29..c4178198d 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -982,7 +982,7 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
   foreach ((array)$message->mime_parts as $pid => $part)
   {
     if ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) {
-      if ($part->ctype_primary == 'message' || $part->ctype_primary == 'multipart') {
+      if (($part->ctype_primary == 'message' && $bodyIsHtml) || $part->ctype_primary == 'multipart') {
         continue;
       }
       if ($part->mimetype == 'application/ms-tnef') {