diff --git a/ChangeLog b/ChangeLog
index 4cb6edd32..ecc0ec5b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
+	-supportsQuotas]): test quota support by querying the server capability.
+
 2008-02-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartICalActions.m ([UIxMailPartICalActions -acceptAction])
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 8b3559860..4a64431b4 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -175,10 +175,12 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default
 - (BOOL) supportsQuotas
 {
   NGImap4Client *imapClient;
+  NSArray *capability;
 
   imapClient = [[self imap4Connection] client];
+  capability = [[imapClient capability] objectForKey: @"capability"];
 
-  return [[imapClient context] canQuota];
+  return [capability containsObject: @"quota"];
 }
 
 /* hierarchy */