diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3695b94b510..fae73613d1f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-22  Sam Steingold  <sds@gnu.org>
+
+	* gnus-msg.el (gnus-setup-message): Also bind `winconf-name'.
+
 2011-02-22  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 29ac43115c8..4e88b871ac0 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -383,6 +383,7 @@ Thank you for your help in stamping out bugs.
 (defvar gnus-article-reply nil)
 (defmacro gnus-setup-message (config &rest forms)
   (let ((winconf (make-symbol "gnus-setup-message-winconf"))
+        (winconf-name (make-symbol "gnus-setup-message-winconf"))
 	(buffer (make-symbol "gnus-setup-message-buffer"))
 	(article (make-symbol "gnus-setup-message-article"))
 	(yanked (make-symbol "gnus-setup-yanked-articles"))