diff --git a/ChangeLog b/ChangeLog
index 2c14f2e4e..5b20db642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder
+	-appendObject:objectwithBaseURL:baseURLtoREPORTResponse:r]):
+	escape the record string in a way suitable with XML encoding.
+
 2007-01-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.js: fixed a bug where the
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 3d39ef3ad..9cbda1823 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -134,7 +134,7 @@ static NSNumber   *sharedYes = nil;
      toREPORTResponse: (WOResponse *) r
 {
   SOGoContentObject *ocsObject;
-  NSString *c_name, *etagLine, *dataLine;
+  NSString *c_name, *etagLine, *calString;
 
   c_name = [object objectForKey: @"c_name"];
 
@@ -157,13 +157,10 @@ static NSNumber   *sharedYes = nil;
   [r appendContentString: @"      </D:prop>\r\n"];
   [r appendContentString: @"      <D:status>HTTP/1.1 200 OK</D:status>\r\n"];
   [r appendContentString: @"    </D:propstat>\r\n"];
-
-  dataLine
-    = [NSString
-        stringWithFormat: @"    <C:calendar-data>%@</C:calendar-data>\r\n",
-        [ocsObject contentAsString]];
-  [r appendContentString: dataLine];
-
+  [r appendContentString: @"    <C:calendar-data>"];
+  calString = [[ocsObject contentAsString] stringByEscapingXMLString];
+  [r appendContentString: calString];
+  [r appendContentString: @"</C:calendar-data>\r\n"];
   [r appendContentString: @"  </D:response>\r\n"];
 }