2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 88a00bc6d43..fb173c4009b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,12 +1,15 @@
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * gnus.el (gnus-message-archive-group): Quote value.
+        (gnus-message-archive-group): Mark as changed.
+
         * shr.el (shr-add-font): Don't put the font properties on the newline
         or the indentation.
 
         * message.el (message-fix-before-sending): Change options when sending
         non-printable characters.
 
-        * gnus.el (gnus-update-message-archive-method): Change the default to
+        * gnus.el (gnus-message-archive-method): Change the default to
         monthly outgoing groups.
 
         * gnus-sum.el (gnus-summary-edit-article-done): Try to replace articles
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index f809d5c8ae0..bd78c6aef35 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1356,12 +1356,12 @@ updated if the value of this variable is nil, even if you change the
 value of `gnus-message-archive-method' afterward.  If you want the
 saved \"archive\" method to be updated whenever you change the value of
 `gnus-message-archive-method', set this variable to a non-nil value."
-  :version "24.1"
+  :version "23.1"
   :group 'gnus-server
   :group 'gnus-message
   :type 'boolean)
 
-(defcustom gnus-message-archive-group ((format-time-string "sent.%Y-%m"))
+(defcustom gnus-message-archive-group '((format-time-string "sent.%Y-%m"))
   "*Name of the group in which to save the messages you've written.
 This can either be a string; a list of strings; or an alist
 of regexps/functions/forms to be evaluated to return a string (or a list
@@ -1381,6 +1381,7 @@ unprefixed -- which implicitly means \"store on the archive server\".
 However, you may wish to store the message on some other server.  In
 that case, just return a fully prefixed name of the group --
 \"nnml+private:mail.misc\", for instance."
+  :version "24.1"
   :group 'gnus-message
   :type '(choice (const :tag "none" nil)
                  (const :tag "Weekly" ((format-time-string "sent.%Yw%U")))