diff --git a/ChangeLog b/ChangeLog
index 1301fbd51..be8dac0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-04-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -groupDavResourceType]): return both
+	"vevent-collection" and "vtodo-collection".
+
 	* UI/Common/UIxUserRightsEditor.[hm]: new template class module
 	that implements the detailed editor of user rights per-object.
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index b877f3007..542cbb51e 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -412,22 +412,26 @@ static NSNumber   *sharedYes = nil;
   return classes;
 }
 
-- (NSString *) groupDavResourceType
+- (NSArray *) groupDavResourceType
 {
-  return @"vevent-collection";
+  return [NSArray arrayWithObjects: @"vevent-collection",
+		  @"vtodo-collection", nil];
 }
 
 - (NSArray *) davResourceType
 {
   static NSArray *colType = nil;
-  NSArray *gdCol, *cdCol;
+  NSArray *cdCol;
+  NSMutableArray *gdCol;
 
   if (!colType)
     {
+      gdCol = [NSMutableArray new];
+      [gdCol addObjectsFromArray: [self groupDavResourceType]];
+      [gdCol addObject: XMLNS_GROUPDAV];
       cdCol = [NSArray arrayWithObjects: @"calendar", XMLNS_CALDAV, nil];
-      gdCol = [NSArray arrayWithObjects: [self groupDavResourceType],
-                       XMLNS_GROUPDAV, nil];
       colType = [NSArray arrayWithObjects: @"collection", cdCol, gdCol, nil];
+      [gdCol release];
       [colType retain];
     }