(message-send-mail-with-sendmail): Bind

coding-system-for-write by the return value of
select-message-coding-system.
(message-send-mail-with-qmail): Likewise.

1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 86d41cc00ad..185696f874a 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1904,7 +1904,8 @@ the user from the mailer."
         (save-excursion
           (set-buffer errbuf)
           (erase-buffer))))
-    (let ((default-directory "/"))
+    (let ((default-directory "/")
+          (coding-system-for-write (select-message-coding-system)))
       (apply 'call-process-region
              (append (list (point-min) (point-max)
                            (if (boundp 'sendmail-program)
@@ -1952,6 +1953,7 @@ to find out how to use this."
   (run-hooks 'message-send-mail-hook)
   ;; send the message
   (case
+   (let ((coding-system-for-write (select-message-coding-system)))
       (apply
        'call-process-region 1 (point-max) message-qmail-inject-program
        nil nil nil
@@ -1972,7 +1974,7 @@ to find out how to use this."
        ;; free for -inject-arguments -- a big win for the user and for us
        ;; since we don't have to play that double-guessing game and the user
        ;; gets full control (no gestapo'ish -f's, for instance).  --sj
-       message-qmail-inject-args)
+       message-qmail-inject-args))
     ;; qmail-inject doesn't say anything on it's stdout/stderr,
     ;; we have to look at the retval instead
     (0 nil)