diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index f1181d40910..bac987e2f00 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -415,11 +415,12 @@ only affect the Gcc copy, but not the original message."
 			     gnus-article-reply)))
 	   (,oarticle gnus-article-reply)
 	   (,yanked gnus-article-yanked-articles)
-	   (,group (when gnus-article-reply
-		     (or (nnselect-article-group
-			  (or (car-safe gnus-article-reply)
-			      gnus-article-reply))
-			 gnus-newsgroup-name)))
+           (,group (if gnus-article-reply
+		       (or (nnselect-article-group
+			    (or (car-safe gnus-article-reply)
+			        gnus-article-reply))
+                           gnus-newsgroup-name)
+                     gnus-newsgroup-name))
 	   (message-header-setup-hook
 	    (copy-sequence message-header-setup-hook))
 	   (mbl mml-buffer-list)