diff --git a/ChangeLog b/ChangeLog
index 649e17f27..6078f135a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(_appendComponentProperties:matchingFilters:toResponse:)
+	(_appendComponentProperties:matchingURLs:toResponse:): ensure that
+	baseURL ends with "/".
+
 2009-12-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (-fetchContentObjectNames):
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index e1c465207..0d51e7fd8 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1308,8 +1308,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   [r appendFormat: @"<D:response><D:href>"];
   [r appendString: baseURL];
-//   if (![baseURL hasSuffix: @"/"])
-//     [r appendContentString: @"/"];
   [r appendString: [object objectForKey: @"c_name"]];
   [r appendString: @"</D:href>"];
 
@@ -1715,6 +1713,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
     if ([currentField length])
       [fields addObjectUniquely: currentField];
   baseURL = [self davURLAsString];
+#warning review this when fixing http://www.scalableogo.org/bugs/view.php?id=276
+  if (![baseURL hasSuffix: @"/"])
+    baseURL = [NSString stringWithFormat: @"%@/", baseURL];
 
   propertiesArray = [[properties allKeys] asPointersOfObjects];
   propertiesCount = [properties count];
@@ -1934,6 +1935,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   NSEnumerator *addFields;
 
   baseURL = [self davURLAsString];
+#warning review this when fixing http://www.scalableogo.org/bugs/view.php?id=276
+  if (![baseURL hasSuffix: @"/"])
+    baseURL = [NSString stringWithFormat: @"%@/", baseURL];
 
   urls = [NSMutableArray array];
   max = [refs length];
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 33bed506f..8d0d4a971 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -1064,6 +1064,9 @@ static NSArray *childRecordFields = nil;
   newToken = 0;
 
   baseURL = [self davURLAsString];
+#warning review this when fixing http://www.scalableogo.org/bugs/view.php?id=276
+  if (![baseURL hasSuffix: @"/"])
+    baseURL = [NSString stringWithFormat: @"%@/", baseURL];
 
   max = [records count];
   syncResponses = [NSMutableArray arrayWithCapacity: max + 1];