# HG changeset patch
# User Jeffrey C Honig <jch@bsdi.com>
# Date 1187577164 0
# Node ID c4d5c23a6b0a1c220fae8e5a4ceba7532a2918c7
# Parent  64024508c51b06f45c9f6f507dbfa0fa63b484ce
(mh-mml-forward-message): Address SF 1378993 and
forward messages as inline attatchments.

diff -r 64024508c51b -r c4d5c23a6b0a lisp/mh-e/mh-mime.el
--- a/lisp/mh-e/mh-mime.el	Sun Aug 19 23:55:12 2007 +0000
+++ b/lisp/mh-e/mh-mime.el	Mon Aug 20 02:32:44 2007 +0000
@@ -1220,16 +1220,11 @@
                  mh-sent-from-msg
                (string-to-number message))))
     (cond ((integerp msg)
-           (if (string= "" description)
-               ;; Rationale: mml-attach-file constructs a malformed composition
-               ;; if the description string is empty.  This fixes SF #625168.
-               (mml-attach-file (format "%s%s/%d"
-                                        mh-user-path (substring folder 1) msg)
-                                "message/rfc822")
-             (mml-attach-file (format "%s%s/%d"
-                                      mh-user-path (substring folder 1) msg)
-                              "message/rfc822"
-                              description)))
+           (mml-attach-file (format "%s%s/%d"
+                                    mh-user-path (substring folder 1) msg)
+                            "message/rfc822"
+                            (if (string= "" description) nil description)
+                            "inline"))
           (t (error "The message number, %s, is not a integer" msg)))))
 
 (defun mh-mh-forward-message (&optional description folder messages)