diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 58acb9daa..230a1b7f8 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -311,14 +311,12 @@
 }
 
 - (void) _setupRecurrenceInCalendar: (iCalCalendar *) calendar
+                          withEvent: (iCalEvent *) event
                            fromData: (NSData *) mapiRecurrenceData
 {
   struct Binary_r *blob;
   struct AppointmentRecurrencePattern *pattern;
   NSMutableArray *otherEvents;
-  iCalEvent *event;
-
-  event = [sogoObject component: NO secure: NO];
 
   /* cleanup */
   otherEvents = [[calendar events] mutableCopy];
@@ -498,6 +496,7 @@
                 objectForKey: MAPIPropertyKey (PidLidAppointmentRecur)];
       if (value)
         [self _setupRecurrenceInCalendar: vCalendar
+	                       withEvent: newEvent
                                 fromData: value];
 
       // Organizer
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index 894892ba6..0f1a9ef37 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -664,8 +664,7 @@
     {
       dateValue = [NSCalendarDate dateWithString: stringValue
                                   calendarFormat: @"%Y-%m-%d"];
-      // FIXME: We add a day, otherwise Outlook 2003 will display at day earlier
-      dateValue = [dateValue addYear: 0 month: 0 day: 1 hour: 0 minute: 0 second: 0];
+      //dateValue = [dateValue addYear: 0 month: 0 day: 1 hour: 0 minute: 0 second: 0];
       *data = [dateValue asFileTimeInMemCtx: memCtx];
     }
   else
@@ -957,7 +956,7 @@
 
 
   //
-  // job title, nickname, company name, deparment, work url, im address/screen name
+  // job title, nickname, company name, deparment, work url, im address/screen name and birthday
   //
   value = [newProperties objectForKey: MAPIPropertyKey(PR_TITLE_UNICODE)];
   if (value)
@@ -992,6 +991,13 @@
 	to: value];
     }
 
+  value = [newProperties objectForKey: MAPIPropertyKey(PR_BIRTHDAY)];
+  if (value)
+    {
+      [newCard setBday: [value descriptionWithCalendarFormat: @"%Y-%m-%d"]];
+    }
+
+
   //
   // we save the new/modified card
   //