diff --git a/ChangeLog b/ChangeLog
index 46cf4c2dc..8843a2346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-17  Cyril Robert <crobert@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(freebusyResponseForRecipient): Removed CDATA tag
+	* SoObjects/Appointments/SOGoFreeBusyObject.m (iCalPersonWithUID): Removed 
+	setCn, since iCal fails when present.
+
 2009-07-16  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -setOwner:]): update
diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index d6236c188..c54f4a541 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-17  Cyril Robert <crobert@inverse.ca>
+
+	* iCalPerson.m: Lowercased MAILTO to make it work with iCal.
+
 2009-04-21  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* iCalTrigger.m ([iCalTrigger -setRelationType:]): new method to
diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index 11b76507a..77df8b154 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -56,7 +56,7 @@
 - (void) setEmail: (NSString *)_s
 {
   [self setValue: 0
-        to: [NSString stringWithFormat: @"MAILTO:%@", _s]];
+        to: [NSString stringWithFormat: @"mailto:%@", _s]];
 }
 
 - (NSString *) email
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index b506f19c6..78244dd67 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1996,7 +1996,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 {
   NSDictionary *response;
   NSMutableArray *content;
-  SOGoWebDAVValue *cdata;
   NSString *escapedData;
 
   content = [NSMutableArray array];
@@ -2006,12 +2005,10 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
     {
       [content addObject: davElementWithContent (@"request-status", XMLNS_CALDAV,
 						 @"2.0;Success")];
-      escapedData = [NSString stringWithFormat: @"<![CDATA[%@]]>",
+      escapedData = [NSString stringWithFormat: @"%@",
                               [calendarData stringByEscapingXMLString]];
-      cdata = [SOGoWebDAVValue valueForObject: escapedData
-                                   attributes: nil];
       [content addObject: davElementWithContent (@"calendar-data", XMLNS_CALDAV,
-                                                 cdata)];
+                                                 escapedData)];
     }
   else
       [content addObject:
@@ -2129,10 +2126,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   if (tags)
     {
       [response setStatus: 200];
-      [response appendContentString:@"<?xml version=\"1.0\""
-		@" encoding=\"utf-8\"?>"];
+      [response appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
       [response setHeader: @"application/xml; charset=utf-8"
-		forKey: @"Content-Type"];
+                   forKey: @"Content-Type"];
       [response appendContentString:
 		  [tags asWebDavStringWithNamespaces: nil]];
     }
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 5b790ee10..d2b43b790 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -82,7 +82,6 @@ static unsigned int freebusyRangeEnd = 0;
 
   person = [iCalPerson new];
   [person autorelease];
-  [person setCn: [contactInfos objectForKey: @"cn"]];
   [person setEmail: [contactInfos objectForKey: @"c_email"]];
 
   return person;