diff --git a/ChangeLog b/ChangeLog
index 9a7c0afee..a55921e4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
+	-extractQuickFieldsFromTodo:_task]): fixed to use NSNull instead
+	of NSNotFound.
+
 	* UI/Scheduler/UIxTaskEditor.m ([UIxTaskEditor
 	-iCalStringTemplate]): start and due date are now optional.
 
diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index 1231aa504..2e515cada 100644
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -193,8 +193,8 @@ static NSNumber                  *distantFutureNumber = nil;
   NSCalendarDate      *startDate, *dueDate;
   NSArray             *attendees;
   NSString            *uid, *title, *location, *status, *accessClass;
-  NSNumber            *sequence, *date;
-  id                  organizer;
+  NSNumber            *sequence;
+  id                  organizer, date;
   id                  participants, partmails;
   NSMutableString     *partstates;
   unsigned            i, count, code;
@@ -242,12 +242,13 @@ static NSNumber                  *distantFutureNumber = nil;
   if ([startDate isNotNull])
     date = [self numberForDate: startDate];
   else
-    date = [NSNumber numberWithInt: NSNotFound];
+    date = [NSNull null];
   [row setObject: date forKey: @"startdate"];
+
   if ([dueDate isNotNull]) 
     date = [self numberForDate: dueDate];
   else
-    date = [NSNumber numberWithInt: NSNotFound];
+    date = [NSNull null];
   [row setObject: date forKey: @"enddate"];
 
   if ([participants length] > 0)