3 files changed, 39 insertions, 10 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c0c5c8dad2b..83ca62ca0de 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2,6 +2,15 @@
 
         * Relicense all FSF files to GPLv3 or later.
 
+2007-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-msg.el (gnus-summary-supersede-article)
+        (gnus-summary-resend-message-edit): Add Gcc header.
+        (gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
+        article's Message-ID; refer parent article in summary buffer.
+
+        * message.el (message-bounce): Call mime-to-mml.
+
 2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 0789e25bc68..c9aedab7019 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -815,7 +815,10 @@ header line with the old Message-ID."
                (set-buffer ,gnus-summary-buffer)
                (gnus-cache-possibly-remove-article ,article nil nil nil t)
                (gnus-summary-mark-as-read ,article gnus-canceled-mark)))))
-       message-send-actions))))
+       message-send-actions)
+      ;; Add Gcc header.
+      (gnus-inews-insert-archive-gcc)
+      (gnus-inews-insert-gcc))))
 
 
 
@@ -1280,10 +1283,13 @@ composing a new message."
         (message-narrow-to-head-1)
         ;; Gnus will generate a new one when sending.
         (message-remove-header "Message-ID")
-        (message-remove-header message-ignored-resent-headers t)
         ;; Remove unwanted headers.
+        (message-remove-header message-ignored-resent-headers t)
         (goto-char (point-max))
         (insert mail-header-separator)
+        ;; Add Gcc header.
+        (gnus-inews-insert-archive-gcc)
+        (gnus-inews-insert-gcc)
         (goto-char (point-min))
         (when (re-search-forward "^To:\\|^Newsgroups:" nil 'move)
           (forward-char 1))
@@ -1557,15 +1563,29 @@ If FETCH, try to fetch the article that this is a reply to, if indeed
 this is a reply."
   (interactive "P")
   (gnus-summary-select-article t)
-  (set-buffer gnus-original-article-buffer)
-  (gnus-setup-message 'compose-bounce
-    (let* ((references (mail-fetch-field "references"))
-           (parent (and references (gnus-parent-id references))))
+  (let (summary-buffer parent)
+    (if fetch
+        (progn
+          (setq summary-buffer (current-buffer))
+          (set-buffer gnus-original-article-buffer)
+          (article-goto-body)
+          (when (re-search-forward "^References:\n?" nil t)
+            (while (memq (char-after) '(?\t ? ))
+              (forward-line 1))
+            (skip-chars-backward "\t\n ")
+            (setq parent
+                  (gnus-parent-id (buffer-substring (match-end 0) (point))))))
+      (set-buffer gnus-original-article-buffer))
+    (gnus-setup-message 'compose-bounce
       (message-bounce)
+      ;; Add Gcc header.
+      (gnus-inews-insert-archive-gcc)
+      (gnus-inews-insert-gcc)
       ;; If there are references, we fetch the article we answered to.
-      (and fetch parent
-           (gnus-summary-refer-article parent)
-           (gnus-summary-show-all-headers)))))
+      (when parent
+        (with-current-buffer summary-buffer
+          (gnus-summary-refer-article parent)
+          (gnus-summary-show-all-headers))))))
 
 ;;; Gcc handling.
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b98c4eb5366..419fd07727c 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6697,7 +6697,7 @@ you."
         (goto-char boundary)
         (when (re-search-backward "^.?From .*\n" nil t)
           (delete-region (match-beginning 0) (match-end 0)))))
-    (mm-enable-multibyte)
+    (mime-to-mml)
     (save-restriction
       (message-narrow-to-head-1)
       (message-remove-header message-ignored-bounced-headers t)