diff --git a/ChangeLog b/ChangeLog
index d4218014e..f4f2cba44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
+	-extractQuickFieldsFromTodo:_task]): set the start and enddate of
+	quickentries to null whenever each or all of them are null, by
+	providing an impossible timestamp from with NSNotFound as value.
+
 2006-10-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/UIxMailEditor.js: update the algorithm
diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index 06e26c75d..1231aa504 100644
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -193,7 +193,7 @@ static NSNumber                  *distantFutureNumber = nil;
   NSCalendarDate      *startDate, *dueDate;
   NSArray             *attendees;
   NSString            *uid, *title, *location, *status, *accessClass;
-  NSNumber            *sequence;
+  NSNumber            *sequence, *date;
   id                  organizer;
   id                  participants, partmails;
   NSMutableString     *partstates;
@@ -239,10 +239,17 @@ static NSNumber                  *distantFutureNumber = nil;
   if ([location isNotNull]) [row setObject: location forKey:@"location"];
   if ([sequence isNotNull]) [row setObject: sequence forKey:@"sequence"];
   
-  if ([startDate isNotNull]) 
-    [row setObject: [self numberForDate:startDate] forKey:@"startdate"];
+  if ([startDate isNotNull])
+    date = [self numberForDate: startDate];
+  else
+    date = [NSNumber numberWithInt: NSNotFound];
+  [row setObject: date forKey: @"startdate"];
   if ([dueDate isNotNull]) 
-    [row setObject: [self numberForDate:dueDate] forKey:@"enddate"];
+    date = [self numberForDate: dueDate];
+  else
+    date = [NSNumber numberWithInt: NSNotFound];
+  [row setObject: date forKey: @"enddate"];
+
   if ([participants length] > 0)
     [row setObject:participants forKey:@"participants"];
   if ([partmails length] > 0)