diff --git a/ChangeLog b/ChangeLog
index f64b2b057..49cdd4d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
+	-extractQuickFieldsFromTodo:_task]): set "isallday" and "isopaque"
+	to false to avoid a null violation.
+
 2007-07-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index 9b8678f78..9a6188d19 100644
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -19,11 +19,18 @@
   02111-1307, USA.
 */
 
-#include "OCSiCalFieldExtractor.h"
-#include "common.h"
-#include <NGCards/NGCards.h>
-#include "iCalEntityObject+OCS.h"
-#include "iCalRepeatableEntityObject+OCS.h"
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "iCalEntityObject+OCS.h"
+#import "iCalRepeatableEntityObject+OCS.h"
+
+#import "OCSiCalFieldExtractor.h"
 
 @implementation OCSiCalFieldExtractor
 
@@ -250,6 +257,11 @@ static NSNumber *distantFutureNumber = nil;
   [row setObject:[NSNumber numberWithInt:[_task priorityNumber]]
        forKey: @"priority"];
 
+  [row setObject: [NSNumber numberWithBool: NO]
+       forKey: @"isallday"];
+  [row setObject: [NSNumber numberWithBool: NO]
+       forKey: @"isopaque"];
+
   if ([title isNotNull]) [row setObject: title forKey: @"title"];
   if ([location isNotNull]) [row setObject: location forKey: @"location"];
   if ([sequence isNotNull]) [row setObject: sequence forKey: @"sequence"];
@@ -342,14 +354,12 @@ static NSNumber *distantFutureNumber = nil;
 }
 
 - (NSMutableDictionary *)extractQuickFieldsFromContent:(NSString *)_content {
-  NSAutoreleasePool *pool;
   NSDictionary *fields;
   id cal;
  
   if ([_content length] == 0)
     return nil;
 
-  pool = [[NSAutoreleasePool alloc] init];
   cal = [iCalCalendar parseSingleFromSource: _content];
  
   fields = nil;
@@ -370,8 +380,6 @@ static NSNumber *distantFutureNumber = nil;
   else
     [self logWithFormat: @"ERROR: parsing source didn't return anything"];
 
-  [pool release];
- 
   return [fields autorelease];
 }