diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 01e9d74a581..ef08592cf96 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-get-groups): Allow non-quoted strings as mailbox
+	names.
+
 2010-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* shr.el (shr-insert): Revert last change.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 307deba8afd..cb4c9f0108c 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -928,7 +928,6 @@ textual parts.")
     flags))
 
 (deffoo nnimap-request-set-mark (group actions &optional server)
-  (debug)
   (when (nnimap-possibly-change-group group server)
     (let (sequence)
       (with-current-buffer (nnimap-buffer)
@@ -1029,7 +1028,10 @@ textual parts.")
 	    (separator (read (current-buffer)))
 	    (group (read (current-buffer))))
 	(unless (member '%NoSelect flags)
-	  (push group groups))))
+	  (push (if (stringp group)
+		    group
+		  (format "%s" group))
+		groups))))
     (nreverse groups)))
 
 (deffoo nnimap-request-list (&optional server)