diff --git a/ChangeLog b/ChangeLog
index 9c52fe0ad..7331f47af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-03-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders
+	-roleOfUser:uidinContext:context]): take all the subkeys into
+	account, not only the "personal" folder.
+
 	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
 	-takeValuesFromRequest:_rqinContext:_ctx]): append a "uid" field
 	to the new components.
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index 4e57d72d5..fb81bb53a 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -239,17 +239,14 @@
   if ([traversalPath count] > 2)
     {
       objectName = [traversalPath objectAtIndex: 2];
-      if ([objectName isEqualToString: @"personal"])
-        {
-          roles = [[context activeUser]
-                    rolesForObject: [self lookupName: objectName
-                                          inContext: context
-                                          acquire: NO]
-                    inContext: context];
-          if ([roles containsObject: SOGoRole_Assistant]
-              || [roles containsObject: SOGoRole_Delegate])
-            role = SOGoRole_Assistant;
-        }
+      roles = [[context activeUser]
+		rolesForObject: [self lookupName: objectName
+				      inContext: context
+				      acquire: NO]
+		inContext: context];
+      if ([roles containsObject: SOGoRole_Assistant]
+	  || [roles containsObject: SOGoRole_Delegate])
+	role = SOGoRole_Assistant;
     }
 
   return role;