diff --git a/ChangeLog b/ChangeLog
index 9f195a6a2..134449950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* SoObjects/SOGo/SOGoGCSFolder.m (-renameTo:): don't act as the
 	owner of the folder when user is a superuser.
+	(-_realAclsForUser:forObjectAtPath:): don't ignore "None" access
+	right in order to avoid rollbacking to default roles for the
+	calendar module (SOGoCalendarDefaultRoles) when the user has
+	specifically no rights.
 
 2010-09-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index b697fda62..aba227d92 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -1490,8 +1490,7 @@ static NSArray *childRecordFields = nil;
   if (!acls)
     {
       acls = [self _fetchAclsForUser: uid forObjectAtPath: objectPath];
-      if (!acls
-          || ([acls count] == 1 && [acls containsObject: SOGoRole_None]))
+      if (!acls)
         acls = [NSArray array];
       [self _cacheRoles: acls forUser: uid forObjectAtPath: objectPath];
     }