--- /usr/share/emacs/21.1/lisp/gnus/message.el	Sat Mar 17 11:02:56 2001
+++ message.el	Fri Mar  1 18:59:01 2002
@@ -3700,9 +3700,10 @@
     (if (gnus-alive-p)
 	(setq message-draft-article
 	      (nndraft-request-associate-buffer "drafts"))
-      (setq buffer-file-name (expand-file-name "*message*"
-					       message-auto-save-directory))
-      (setq buffer-auto-save-file-name (make-auto-save-file-name)))
+      (if (not buffer-file-name)
+	  (setq buffer-file-name (expand-file-name "*message*"
+						   message-auto-save-directory))
+	(setq buffer-auto-save-file-name (make-auto-save-file-name))))
     (clear-visited-file-modtime)
     (setq buffer-file-coding-system message-draft-coding-system)))