Merge from HEAD (Request #4664).

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index c0f16b7..f5964a7 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.0-cvs
 --------
 
+[mms] Allow all parts in a message to be displayed (Bug #1866).
 [mms] Only support FCKeditor as GUI HTML editor.
 [mms] Strip extra 'Fwd' and 'Re' cruft from subject line when replying to or
       forwarding a message.
@@ -16,6 +17,7 @@ v5.0-cvs
 v4.3.1-cvs
 ----------
 
+[mms] Marked stripped parts as 'attachment', not 'inline' (Request #4664).
 [mms] Fix linking from addresses in mailbox to compose screen (Bug #7432).
 [jan] Use mailer configuration when sending iTip replies (Bug #7388).
 [jan] Always display multipart/appledouble attachments.

diff --git a/imp/lib/Message.php b/imp/lib/Message.php
index 439815d..3bac335 100644 (file)
--- a/imp/lib/Message.php
+++ b/imp/lib/Message.php
@@ -476,11 +476,13 @@ class IMP_Message
             if (!is_a($oldPart, 'Horde_Mime_Part')) {
                 continue;
             }
-            $newPart = new Horde_Mime_Part('text/plain');
+            $newPart = new Horde_Mime_Part();
+            $newPart->setType('text/plain');
+            $newPart->setDisposition('attachment');
 
             /* We need to make sure all text is in the correct charset. */
             $newPart->setCharset(NLS::getCharset());
-            $newPart->setContents(sprintf(_("[Attachment stripped: Original attachment type: %s, name: %s]"), $oldPart->getType(), $oldPart->getName(true, true)), '8bit');
+            $newPart->setContents(sprintf(_("[Attachment stripped: Original attachment type: %s, name: %s]"), $oldPart->getType(), $oldPart->getName(true)), '8bit');
             $message->alterPart($partid, $newPart);
         }