1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index d5c0cb576ee..542a91e0d2c 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -907,6 +907,12 @@ See also the function `select-message-coding-system'.")
                    (progn (skip-chars-forward "\0-\177")
                           (/= (point) (point-max)))
                    (setq coding-system (select-message-coding-system))
+                   ;; Set buffer-file-coding-system to the selected
+                   ;; one.  This prevent the later call of
+                   ;; select-message-coding-system asking a user
+                   ;; again.
+                   (prog1 t
+                     (set-buffer-file-coding-system coding-system))
                    (setq charset
                          (coding-system-get coding-system 'mime-charset))
                    (goto-char delimline)