diff --git a/ChangeLog b/ChangeLog
index 19b4269fe..17cf18a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
+	-extractQuickFieldsFromEvent:_event]): changed "TENTATIVE" code to
+	2 and "CANCELLED" to 0.
+
 2006-10-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/UIxAppointmentEditor.js: handle conversion
diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index 6dbd3a8bb..09cbe20ef 100644
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -143,14 +143,14 @@ static NSNumber                  *distantFutureNumber = nil;
     int code = 1;
     
     if ([status isEqualToString:@"TENTATIVE"])
-      code = 0;
-    else if ([status isEqualToString:@"CANCELLED"])
       code = 2;
+    else if ([status isEqualToString:@"CANCELLED"])
+      code = 0;
     [row setObject:[NSNumber numberWithInt:code] forKey:@"status"];
   }
   else {
     /* confirmed by default */
-    [row setObject:[NSNumber numberWithInt:1] forKey:@"status"];
+    [row setObject: [NSNumber numberWithInt:1] forKey: @"status"];
   }
 
   if([accessClass isNotNull] && ![accessClass isEqualToString:@"PUBLIC"]) {