diff --git a/ChangeLog b/ChangeLog
index 8a01509a4..59cbc60ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m (-davPrincipalURL): moved from
+	SOGoUserFolder.
+
 	* SoObjects/SOGo/WORequest+SOGo.m (-isICal, -isICal4): updated for
 	iCal 5.
 
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 62b01002f..0b70affea 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -562,4 +562,22 @@
   return nil;
 }
 
+- (NSArray *) davPrincipalURL
+{
+  NSArray *principalURL;
+  NSString *classes;
+
+  if ([[context request] isICal4])
+    {
+      classes = [[self davComplianceClassesInContext: context]
+                  componentsJoinedByString: @", "];
+      [[context response] setHeader: classes forKey: @"DAV"];
+    }
+
+  principalURL = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
+                          [self davURLAsString], nil];
+
+  return [NSArray arrayWithObject: principalURL];
+}
+
 @end
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 1584ef8bb..c5536646c 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -635,16 +635,6 @@
 	   getCNForUID: nameInContainer];
 }
 
-- (NSArray *) davPrincipalURL
-{
-  NSArray *principalURL;
-
-  principalURL = [NSArray arrayWithObjects: @"href", @"DAV:", @"D",
-                          [self davURLAsString], nil];
-
-  return [NSArray arrayWithObject: principalURL];
-}
-
 - (NSException *) setDavSignature: (NSString *) newSignature
 {
   SOGoUserDefaults *ud;