diff --git a/ChangeLog b/ChangeLog
index e2080f784..79ae3e64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(davCalendarQuery:): specify default values for "start" and "end"
+	whenever one of them is missing.
+
 2009-06-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 67a20726e..2b6ce722d 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1310,8 +1310,12 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   NSCalendarDate *parsedDate;
 
   parsedDate = [[timeRangeElement attribute: @"start"] asCalendarDate];
+  if (!parsedDate)
+    parsedDate = [NSCalendarDate distantPast];
   [filter setObject: parsedDate forKey: @"start"];
   parsedDate = [[timeRangeElement attribute: @"end"] asCalendarDate];
+  if (!parsedDate)
+    parsedDate = [NSCalendarDate distantFuture];
   [filter setObject: parsedDate forKey: @"end"];
 
   [self _enforceTimeLimitOnFilter: filter];