diff --git a/ChangeLog b/ChangeLog
index 3e1dd012a..052fa7ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	([SOGoCalendarComponent -secureContentAsString]): use a mutable
+	copy of the calendar in order to be able to modify it, otherwise
+	SOGo crashes.
+	([-isFolderish]): removed method, so that the components won't be
+	listed as DAV collections.
+
 2008-07-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 7b3567084..dbdffaf56 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -155,7 +155,7 @@ static BOOL sendEMailNotifications = NO;
   else if (![sm validatePermission: SOGoCalendarPerm_ViewDAndT
 		onObject: self inContext: context])
     {
-      tmpCalendar = [[self calendar: NO secure: NO] copy];
+      tmpCalendar = [[self calendar: NO secure: NO] mutableCopy];
       tmpComponent = (iCalRepeatableEntityObject *)
 	[tmpCalendar firstChildWithTag: [self componentTag]];
       [self _filterComponent: tmpComponent];
@@ -240,11 +240,6 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
   return newOccurence;
 }
 
-- (BOOL) isFolderish
-{
-  return YES;
-}
-
 - (id) toManyRelationshipKeys
 {
   return nil;