--- SOGo-1.1.0.orig/UI/PreferencesUI/UIxPreferences.m	2009-11-18 19:30:17.000000000 -0800
+++ SOGo-1.1.0/UI/PreferencesUI/UIxPreferences.m	2009-11-18 21:03:54.000000000 -0800
@@ -984,17 +984,28 @@
   NSDictionary *element;
   NSArray *k, *v, *names;
   NSMutableArray *rc, *colors;
+  NSUserDefaults *standardDefaults;
+
   int i, count;
 
+  standardDefaults = [NSUserDefaults standardUserDefaults];
+
   names = [userDefaults arrayForKey: @"CalendarCategories"];
-  if (names)
-    colors = [NSMutableArray arrayWithArray: 
-                  [userDefaults arrayForKey: @"CalendarCategoriesColors"]];
-  else
+  colors = [NSMutableArray arrayWithArray: 
+                [userDefaults arrayForKey: @"CalendarCategoriesColors"]];
+  if (!names)
     {
+      names = [standardDefaults arrayForKey: @"SOGoCalendarCategories"];
+      colors = [NSMutableArray arrayWithArray:
+                    [standardDefaults arrayForKey: @"SOGoCalendarCategoriesColors"]];
+    } 
+
+  if (!names)
       names = [[self labelForKey: @"category_labels"]
                 componentsSeparatedByString: @","];
       
+  if (!colors)
+    {
       count = [names count];
       colors = [NSMutableArray arrayWithCapacity: count];
       for (i = 0; i < count; i++)
--- SOGo-1.1.0.orig/UI/Scheduler/UIxComponentEditor.m	2009-11-18 19:30:17.000000000 -0800
+++ SOGo-1.1.0/UI/Scheduler/UIxComponentEditor.m	2009-11-18 20:33:48.000000000 -0800
@@ -825,11 +825,14 @@
 {
   NSMutableArray *categoryList;
   NSArray *categoryLabels;
-  NSUserDefaults *defaults;
+  NSUserDefaults *defaults, *standardDefaults;
 
   defaults = [[context activeUser] userDefaults];
+  standardDefaults = [NSUserDefaults standardUserDefaults];
   categoryLabels = [defaults arrayForKey: @"CalendarCategories"];
   if (!categoryLabels)
+    categoryLabels = [standardDefaults arrayForKey: @"SOGoCalendarCategories"];
+  if (!categoryLabels) 
     categoryLabels = [[self labelForKey: @"category_labels"]
                        componentsSeparatedByString: @","];
   categoryList