1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e56f50cdad1..a193ab41348 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -546,7 +546,8 @@ instead."
             (gnus-setup-message 'message
               (message-mail to subject other-headers continue
                             nil yank-action send-actions return-action)))
-        (setq gnus-newsgroup-name group-name))
+        (with-current-buffer buf
+          (setq gnus-newsgroup-name group-name)))
       (when switch-action
         (setq mail-buf (current-buffer))
         (switch-to-buffer buf)