diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 0ac3926eb4f..d4313e0b2f9 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3023,8 +3023,8 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
     (setq adaptive-fill-first-line-regexp
 	  (concat quote-prefix-regexp "\\|"
 		  adaptive-fill-first-line-regexp)))
-  (setq-default auto-fill-inhibit-regexp nil)
-  (setq-default normal-auto-fill-function 'message-do-auto-fill))
+  (setq-local auto-fill-inhibit-regexp nil)
+  (setq-local normal-auto-fill-function 'message-do-auto-fill))