diff --git a/ChangeLog b/ChangeLog
index 2cfe29694..3175db4b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoFolder.m (-davEntityTag): we no return a
+	pseudo etag for collections for compatibility with the broken
+	Apple clients.
+
 2010-08-19  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/generic.js (showConfirmDialog): new
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 32fb8a614..ea89273ae 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -242,6 +242,11 @@
 
 /* WebDAV */
 
+- (NSString *) davEntityTag
+{
+  return @"\"None\"";
+}
+
 - (NSString *) davContentType
 {
   return @"httpd/unix-directory";