diff --git a/ChangeLog b/ChangeLog
index 7790ef26c..331a1bfd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/iCalEvent+SOGo.m (-quickRecord): set
+	"c_category" to NULL when empty.
+
+	* OGoContentStore/OCSContactFieldExtractor.m
+	(-extractQuickFieldsFromVCard:): same as above.
+
 2011-12-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* Tools/SOGoEAlarmsNotifier.m
diff --git a/OGoContentStore/OCSContactFieldExtractor.m b/OGoContentStore/OCSContactFieldExtractor.m
index 5382ef634..d74e06fd0 100644
--- a/OGoContentStore/OCSContactFieldExtractor.m
+++ b/OGoContentStore/OCSContactFieldExtractor.m
@@ -75,6 +75,8 @@
   if ([values count] > 0)
     [fields setObject: [values componentsJoinedByString: @","]
                forKey: @"c_categories"];
+  else
+    [fields setObject: [NSNull null] forKey: @"c_categories"];
   [fields setObject: @"vcard" forKey: @"c_component"];
 
   return fields;
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index 29fa11dc7..6f2cdc9f1 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -261,6 +261,8 @@
   if ([categories count] > 0)
     [row setObject: [categories componentsJoinedByString: @","]
             forKey: @"c_category"];
+  else
+    [row setObject: [NSNull null] forKey: @"c_category"];
 
   return row;
 }