diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index 58a48dfd0..bb1e73cbe 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -55,9 +55,8 @@
 
 - (void) setEmail: (NSString *)_s
 {
-  // WARNING
-  // don't touch unless you're going to re-test caldav sync 
-  // with an iPhone AND lightning
+  /* iCal.app compatibility:
+     - "mailto" prefix must be in lowercase; */
   [self setValue: 0
         to: [NSString stringWithFormat: @"mailto:%@", _s]];
 }
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 96e880ee5..f00d1dfe0 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2000,9 +2000,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   content = [NSMutableArray array];
 
-  // WARNING
-  // don't touch unless you're going to re-test caldav sync 
-  // with an iPhone AND lightning
   [content addObject: davElementWithContent (@"recipient",
                                              XMLNS_CALDAV, [recipient email])];
   if (user)
@@ -2223,9 +2220,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   [colType addObject: @"collection"];
   [colType addObject: [NSArray arrayWithObjects: @"calendar", XMLNS_CALDAV, nil]];
 
-  // WARNING
-  // don't touch unless you're going to re-test caldav sync 
-  // with an iPhone AND lightning
+  /* iPhone compatibility: we can only return a caldav "calendar"
+     resourcetype. Anything else will prevent the iPhone from querying the
+     collection. */
   request = [context request];
   if (![request isIPhone])
     {
@@ -2241,8 +2238,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
           login = [[context activeUser] login];
           if ([login isEqualToString: [self ownerInContext: self]])
             {
-              //           [colType addObject: [NSArray arrayWithObjects: @"schedule-calendar",
-              //                                                          XMLNS_CALDAV, nil]];
               [colType addObject: [NSArray arrayWithObjects: @"schedule-inbox",
                 XMLNS_CALDAV, nil]];
               [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox",
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 509f807ae..d0a0e436a 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -80,9 +80,8 @@ static unsigned int freebusyRangeEnd = 0;
   um = [LDAPUserManager sharedUserManager];
   contactInfos = [um contactInfosForUserWithUIDorEmail: uid];
 
-  // WARNING
-  // don't touch unless you're going to re-test caldav sync 
-  // with an iPhone AND lightning
+  /* iCal.app compatibility:
+     - don't add "cn"; */
   person = [iCalPerson new];
   [person autorelease];
   [person setEmail: [contactInfos objectForKey: @"c_email"]];