diff --git a/ChangeLog b/ChangeLog
index fdc71f777..97f33dfba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolders.m
+	(-davCalendarComponentSet): new method, copied from
+	SOGoAppointmentFolder.
+
 2009-07-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoContentObject.m (-davResourceType): new
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m
index c64afa030..4917c6abd 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.m
@@ -1,3 +1,4 @@
+
 /* SOGoAppointmentFolders.m - this file is part of SOGo
  *
  * Copyright (C) 2007 Inverse inc.
@@ -21,14 +22,17 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest+So.h>
 #import <NGObjWeb/NSException+HTTP.h>
-
+#import <SaxObjC/XMLNamespaces.h>
 #import <SOGo/WORequest+SOGo.h>
+#import <SOGo/NSObject+DAV.h>
+#import <SOGo/SOGoWebDAVValue.h>
 #import "SOGoAppointmentFolder.h"
 
 #import "SOGoAppointmentFolders.h"
@@ -167,4 +171,32 @@
   return classes;
 }
 
+- (SOGoWebDAVValue *) davCalendarComponentSet
+{
+  static SOGoWebDAVValue *componentSet = nil;
+  NSMutableArray *components;
+
+  if (!componentSet)
+    {
+      components = [NSMutableArray array];
+      /* Totally hackish.... we use the "n1" prefix because we know our
+         extensions will assign that one to ..:caldav but we really need to
+         handle element attributes */
+      [components addObject: [SOGoWebDAVValue
+                               valueForObject: @"<n1:comp name=\"VEVENT\"/>"
+                                   attributes: nil]];
+      [components addObject: [SOGoWebDAVValue
+                               valueForObject: @"<n1:comp name=\"VTODO\"/>"
+                                   attributes: nil]];
+      componentSet
+        = [davElementWithContent (@"supported-calendar-component-set",
+                                  XMLNS_CALDAV,
+                                  components)
+                                 asWebDAVValue];
+      [componentSet retain];
+    }
+
+  return componentSet;
+}
+
 @end