diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index f4a032c647d..d69fd106e5c 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -473,6 +473,7 @@ and send the mail again%s."
   ;; questions about From header validity if the user is going to
   ;; use mailclient, anyway.
   (when (or (and (derived-mode-p 'message-mode)
+                 (not message-server-alist)
 		 (eq (message-default-send-mail-function) 'sendmail-query-once))
 	    (and (not (derived-mode-p 'message-mode))
 		 (eq send-mail-function 'sendmail-query-once)))