diff --git a/ChangeLog b/ChangeLog
index de528af86..1a27e7f41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/iCalEvent+SOGo.m (-quickRecord):
+	-[iCalEntityObject categories] returns an NSArray that we need to
+	convert to a string for the database content.
+
+	* SoObjects/Appointments/iCalToDo+SOGo.m (-quickRecord):
+	-[iCalEntityObject categories] returns an NSArray that we need to
+	convert to a string for the database content.
+
 2011-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoFolder.m
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index a9b4e1a76..cd4315a50 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -68,8 +68,8 @@
 {
   NSMutableDictionary *row;
   NSCalendarDate *startDate, *endDate, *nextAlarmDate;
-  NSArray *attendees;
-  NSString *uid, *title, *location, *status, *category;
+  NSArray *attendees, *categories;
+  NSString *uid, *title, *location, *status;
   NSNumber *sequence;
   id organizer;
   id participants, partmails;
@@ -257,9 +257,10 @@
   else
     [row setObject: [NSNumber numberWithInt: 0] forKey: @"c_nextalarm"];
 
-  category = [self categories];
-  if ([category length] > 0)
-    [row setObject: category forKey: @"c_category"];
+  categories = [self categories];
+  if ([categories count] > 0)
+    [row setObject: [categories componentsJoinedByString: @","]
+            forKey: @"c_category"];
 
   return row;
 }
diff --git a/SoObjects/Appointments/iCalToDo+SOGo.m b/SoObjects/Appointments/iCalToDo+SOGo.m
index 7d03d8c2d..fd3487198 100644
--- a/SoObjects/Appointments/iCalToDo+SOGo.m
+++ b/SoObjects/Appointments/iCalToDo+SOGo.m
@@ -45,8 +45,8 @@
 {
   NSMutableDictionary *row;
   NSCalendarDate *startDate, *dueDate, *nextAlarmDate;
-  NSArray *attendees;
-  NSString *uid, *title, *location, *status, *category;
+  NSArray *attendees, *categories;
+  NSString *uid, *title, *location, *status;
   NSNumber *sequence;
   id organizer, date;
   id participants, partmails;
@@ -201,9 +201,10 @@
   else
     [row setObject: [NSNumber numberWithInt: 0] forKey: @"c_nextalarm"];
   
-  category = [self categories];
-  if ([category length] > 0)
-    [row setObject: category forKey: @"c_category"];
+  categories = [self categories];
+  if ([categories count] > 0)
+    [row setObject: [categories componentsJoinedByString: @","]
+            forKey: @"c_category"];
 
   return row;
 }