diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index 77df8b154..58a48dfd0 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -55,6 +55,9 @@
 
 - (void) setEmail: (NSString *)_s
 {
+  // WARNING
+  // don't touch unless you're going to re-test caldav sync 
+  // with an iPhone AND lightning
   [self setValue: 0
         to: [NSString stringWithFormat: @"mailto:%@", _s]];
 }
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 3891da764..5936df5a5 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1999,6 +1999,9 @@ 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)];
   if (user)
     {
@@ -2122,6 +2125,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   response = [context response];
   if (tags)
     {
+      // WARNING
+      // don't touch unless you're going to re-test caldav sync 
+      // with an iPhone AND lightning
       [response setStatus: 200];
       [response appendContentString: @"<?xml version=\"1.0\""
                 @" encoding=\"utf-8\"?>"];
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index d2b43b790..509f807ae 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -80,6 +80,9 @@ 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
   person = [iCalPerson new];
   [person autorelease];
   [person setEmail: [contactInfos objectForKey: @"c_email"]];