diff --git a/ChangeLog b/ChangeLog
index fb2384ae9..1e8e5bad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+commit 62fee93d866b8eb35abbf67d61ba5274a3a27827
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Tue Apr 16 14:33:57 2013 -0400
+
+    Fix for bug #2287
+
+M	SoObjects/SOGo/SOGoUser.m
+M	SoObjects/SOGo/SOGoUserDefaults.m
+
+commit 139c14d9e109e08643d5c2a5d84fdd6d8016117f
+Author: Jean Raby <jraby@inverse.ca>
+Date:   Tue Apr 16 12:06:17 2013 -0400
+
+    save: memCtx
+    
+    Same fix as for MAPIStoreContactMessage
+
+M	OpenChange/MAPIStoreTasksMessage.m
+
+commit 8ee15c6f776ab9ca934f50780ed58c2f8aadbefe
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Apr 16 08:34:10 2013 -0400
+
+    Update Installation Guide
+    
+    Improved the description of the parameters IMAPHostFieldName and
+    SieveHostFieldName.
+
+M	Documentation/SOGo Installation Guide.odt
+
+commit 5d174140185905507677520ee41cc5760602fb7e
+Author: Jean Raby <jraby@inverse.ca>
+Date:   Mon Apr 15 14:13:07 2013 -0400
+
+    [MAPIStoreContactsMessage save] needs memCtx
+    
+    From extrafu
+
+M	OpenChange/MAPIStoreContactsMessage.m
+
+commit 3cd91846a633057e27d476cd0a6cc7e1d499dc1f
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Apr 11 16:32:17 2013 -0400
+
+    Fix CSS color refresh of calendars
+
+M	UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+
+commit 3739cb1536fcc8defaa0edb804fa5f5ffcaacf94
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Apr 11 12:55:11 2013 -0400
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit 30f10ee8f06157b1222d68b0502c80162fcbb277
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Thu Apr 11 11:30:23 2013 -0400
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index 5b7093800..f435557d6 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/NEWS b/NEWS
index 73529d9bf..a937922eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.0.5a (2013-04-17)
+
+Bug fixes
+ - Fixed an issue when parsing user CN with leading or trailing spaces (#2287)
+ - Fixed a crash that occured when saving contacts or tasks via Outlook
+
 2.0.5 (2013-04-11)
 ------------------
 
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index c02eb8cbd..b2a5ce660 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -911,7 +911,7 @@ fromProperties: (NSDictionary *) attachmentProps
 //
 //
 //
-- (void) save
+- (void) save:(TALLOC_CTX *) memCtx
 {
   NSArray *elements, *units;
   CardElement *element;
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index f2ebd4ed2..2a7958f19 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -357,7 +357,7 @@
   return rc;
 }
 
-- (void) save
+- (void) save:(TALLOC_CTX *) memCtx
 {
   iCalCalendar *vCalendar;
   iCalToDo *vToDo;
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index ca65498b4..3fff2bb5a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -277,7 +277,7 @@
 
 - (void) _fetchCN
 {
-  cn = [self _fetchFieldForUser: @"cn"];
+  cn = [[self _fetchFieldForUser: @"cn"] stringByTrimmingSpaces];
   [cn retain];
 }
 
@@ -703,7 +703,8 @@
       if (![fullName length])
         fullName = login;
       [identity setObject: fullName forKey: @"fullName"];
-      [identity setObject: [mails objectAtIndex: count] forKey: @"email"];
+      [identity setObject: [[mails objectAtIndex: count] stringByTrimmingSpaces]
+                   forKey: @"email"];
 
       if ([replyTo length] > 0)
         [identity setObject: replyTo forKey: @"replyTo"];
diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index 81f6cada8..bba384f43 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -558,7 +558,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   if ([newValue length] == 0)
     newValue = nil;
-  [self setObject: newValue forKey: @"SOGoMailCustomFullName"];
+  [self setObject: [newValue stringByTrimmingSpaces]
+           forKey: @"SOGoMailCustomFullName"];
 }
 
 - (NSString *) mailCustomFullName
@@ -570,7 +571,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   if ([newValue length] == 0)
     newValue = nil;
-  [self setObject: newValue forKey: @"SOGoMailCustomEmail"];
+  [self setObject: [newValue stringByTrimmingSpaces]
+           forKey: @"SOGoMailCustomEmail"];
 }
 
 - (NSString *) mailCustomEmail
@@ -582,7 +584,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   if ([newValue length] == 0)
     newValue = nil;
-  [self setObject: newValue forKey: @"SOGoMailReplyTo"];
+  [self setObject: [newValue stringByTrimmingSpaces]
+           forKey: @"SOGoMailReplyTo"];
 }
 
 - (NSString *) mailReplyTo
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index 0971911e8..672150bb9 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -9,9 +9,9 @@
   <style type="text/css">
     <var:foreach list="calendars" item="currentCalendar">
 .calendarFolder<var:string value="currentCalendar.folder" />
-{ background-color: <var:string value="currentCalendar.color" /> !important; color: <var:string value="contrastingTextColor" /> !important; }
+{ background-color: <var:string value="currentCalendar.color" />; color: <var:string value="contrastingTextColor" />; }
 div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
-{ color: <var:string value="currentCalendar.color" /> !important; }
+{ color: <var:string value="currentCalendar.color" />; }
     </var:foreach>
   </style>
   <div id="calendarSelector">
diff --git a/Version b/Version
index 1217233bd..bc13962a4 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=0
-SUBMINOR_VERSION=5
+SUBMINOR_VERSION=5a