diff --git a/ChangeLog b/ChangeLog
index 00cca87c2..3d065b85c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-05-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
+	-hasSupportForDefaultRoles]): override method by returning "YES".
+
 	* SoObjects/SOGo/NSArray+Utilities.m ([NSMutableArray
 	-addObjectUniquely:object]): new method with an explicit name.
 
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index ed75b3ce3..451afdd76 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -218,9 +218,9 @@
     : 0 /* 0 means 'do not check' */;
   
   /* attempt a save */
-  
-  if ((error = [self saveContentString:[rq contentAsString]
-		     baseVersion:baseVersion]) != nil)
+
+  if ((error = [self saveContentString: [rq contentAsString]
+		     baseVersion: baseVersion]) != nil)
     return error;
   
   /* setup response */
@@ -303,9 +303,9 @@
 
 /* acls */
 
-- (NSArray *) acls
+- (NSArray *) aclUsers
 {
-  return [container aclsForObjectAtPath: [self pathArrayToSoObject]];
+  return [container aclUsersForObjectAtPath: [self pathArrayToSoObject]];
 }
 
 - (NSArray *) aclsForUser: (NSString *) uid
@@ -343,6 +343,11 @@
                     forObjectAtPath: [self pathArrayToSoObject]];
 }
 
+- (BOOL) hasSupportForDefaultRoles
+{
+  return YES;
+}
+
 /* message type */
 
 - (NSString *) outlookMessageClass