diff --git a/ChangeLog b/ChangeLog
index 33493d6da..7b46d4088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
+	-aclsForUser:uid]): object inherits the 'SOGoRole_ObjectEditor'
+	role from its parent folder.
+
 2007-10-19  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUser.m 
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 255db3b65..00ed0779e 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -382,6 +382,8 @@
 	}
       if ([containerAcls containsObject: SOGoRole_ObjectReader])
 	[acls addObject: SOGoRole_ObjectViewer];
+      if ([containerAcls containsObject: SOGoRole_ObjectEditor])
+	[acls addObject: SOGoRole_ObjectEditor];
     }
 
   return acls;