(message-resend): Don't disable encoding unless it's already encoded.

This makes resending work in nndraft buffers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fac82b2..04ca301 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * message.el (message-resend): Don't disable encoding unless it's
+       already encoded.
+
        * nnimap.el (nnimap-update-info): Fix problem with `g' chopping of
        low-numbered articles.
 

diff --git a/lisp/message.el b/lisp/message.el
index 9a1fa22..bff11b2 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7476,7 +7476,11 @@ is for the internal use."
       (when (looking-at "From ")
        (replace-match "X-From-Line: "))
       ;; Send it.
-      (let ((message-inhibit-body-encoding t)
+      (let ((message-inhibit-body-encoding
+            ;; Don't do any further encoding if it looks like the
+            ;; message has already been encoded.
+            (let ((case-fold-search t))
+              (re-search-forward "^mime-version:" nil t)))
            (message-inhibit-ecomplete t)
            message-required-mail-headers
            message-generate-hashcash