diff --git a/ChangeLog b/ChangeLog
index 92a2f538b..1e50d1c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-04-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder -davResourceType]): fixed a problem with
+	our double declaration where the resulting XML would be screwed.
+	There is only one collection per namespace.
+
 	* SoObjects/SOGo/NSCalendarDate+SOGo.m ([NSCalendarDate
 	rfc822DateString]): new method that returns a string conform to
 	rfc 822 and suitable for email headers.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 1dd53077a..bfc9fb137 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -421,17 +421,18 @@ static NSNumber   *sharedYes = nil;
 - (NSArray *) davResourceType
 {
   static NSArray *colType = nil;
-  NSArray *cdCol;
-  NSMutableArray *gdCol;
+  NSArray *cdCol, *gdRT, *gdVEventCol, *gdVTodoCol;
 
   if (!colType)
     {
-      gdCol = [NSMutableArray new];
-      [gdCol addObjectsFromArray: [self groupDavResourceType]];
-      [gdCol addObject: XMLNS_GROUPDAV];
+      gdRT = [self groupDavResourceType];
+      gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
+			     XMLNS_GROUPDAV, nil];
+      gdVTodoCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 1],
+			    XMLNS_GROUPDAV, nil];
       cdCol = [NSArray arrayWithObjects: @"calendar", XMLNS_CALDAV, nil];
-      colType = [NSArray arrayWithObjects: @"collection", cdCol, gdCol, nil];
-      [gdCol release];
+      colType = [NSArray arrayWithObjects: @"collection", cdCol,
+			 gdVEventCol, gdVTodoCol, nil];
       [colType retain];
     }