diff --git a/ChangeLog b/ChangeLog
index 75b120ca02..054060b156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
+Tue Nov  6 14:17:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
+
+	* lib/net/imap.rb (getquota_response): use astring for mailbox
+	names.
+
+	* lib/net/imap.rb (getacl_response): ditto.
+
 Sat Nov  3 22:28:51 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
+
 	* matrix.rb (Matrix#column_vectors, Matrix#row_vectors): ditto bug. 
 	  this bug report and fix by tsutomu@nucba.ac.jp.
 	
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 8445e2cda8..a74b3a7834 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1980,8 +1980,7 @@ module Net
         token = match(T_ATOM)
         name = token.value.upcase
         match(T_SPACE)
-        token = match(T_ATOM)
-        mailbox = token.value
+        mailbox = astring
         match(T_SPACE)
         match(T_LPAR)
         match(T_ATOM)
@@ -2000,8 +1999,7 @@ module Net
         token = match(T_ATOM)
         name = token.value.upcase
         match(T_SPACE)
-        token = match(T_ATOM)
-        mailbox = token.value
+        mailbox = astring
         token = lookahead
         if token.symbol == T_SPACE
           shift_token