diff --git a/ChangeLog b/ChangeLog
index ee5fd8cb6..ded5bc81b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoAppointmentFolders.m
+	(-toOneRelationShipKeys): with a request from iCal, we return
+	nothing to avoid confusing iCal 3 with non-collection resources.
+
 	* UI/Common/UIxAclEditor.m (-isPublicAccessEnabled): we now expose
 	the state of public access in order to not show the "anonymous"
 	user when not needed.
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m
index cd14805f4..a8420350b 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.m
@@ -155,10 +155,10 @@
               && ![folder isSubscription])
             {
               folderObjectKey = [NSString stringWithFormat: @"%@.ics",
-                                 [folder nameInContainer]];
+                                          [folder nameInContainer]];
               [folderObjectKeys addObject: folderObjectKey];
               folderObjectKey = [NSString stringWithFormat: @"%@.xml",
-                                 [folder nameInContainer]];
+                                          [folder nameInContainer]];
               [folderObjectKeys addObject: folderObjectKey];
             }
         }
@@ -169,7 +169,14 @@
 
 - (NSArray *) toOneRelationshipKeys
 {
-  return [self folderObjectKeys];
+  NSArray *keys;
+
+  if ([[contextd request] isICal])
+    keys = [NSArray array];
+  else
+    keys = [self folderObjectKeys];
+
+  return keys;
 }
 
 - (id) lookupName: (NSString *) name