diff --git a/ChangeLog b/ChangeLog
index 5ad844fe5..e689671cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/SOGo/SOGoGCSFolder.m (setRoles:forUser:..)
+	We now even cache "None" roles.
+
 2011-10-13  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* Tools/SOGoToolUserPreferences.m (-run): added possibility to
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index e2025710f..96bb3890f 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -1637,11 +1637,13 @@ static NSArray *childRecordFields = nil;
   [newRoles removeObject: SOGoRole_AuthorizedSubscriber];
   [newRoles removeObject: SOGoRole_None];
   objectPath = [objectPathArray componentsJoinedByString: @"/"];
-  [self _cacheRoles: newRoles forUser: uid
-    forObjectAtPath: objectPath];
+  
   if (![newRoles count])
     [newRoles addObject: SOGoRole_None];
 
+  [self _cacheRoles: newRoles forUser: uid
+	      forObjectAtPath: objectPath];
+
   [self _commitRoles: newRoles forUID: aUID forObject: objectPath];
 }