diff --git a/OpenChange/SOGoAppointmentObject+MAPIStore.h b/OpenChange/SOGoAppointmentObject+MAPIStore.h
index afd3a9256..f44dd90f2 100644
--- a/OpenChange/SOGoAppointmentObject+MAPIStore.h
+++ b/OpenChange/SOGoAppointmentObject+MAPIStore.h
@@ -6,7 +6,7 @@
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,
diff --git a/OpenChange/SOGoAppointmentObject+MAPIStore.m b/OpenChange/SOGoAppointmentObject+MAPIStore.m
index b256aea35..772e08ce8 100644
--- a/OpenChange/SOGoAppointmentObject+MAPIStore.m
+++ b/OpenChange/SOGoAppointmentObject+MAPIStore.m
@@ -6,7 +6,7 @@
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,
@@ -27,6 +27,8 @@
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSString.h>
 
+#import <NGExtensions/NSObject+Logs.h>
+
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
@@ -86,18 +88,21 @@
   iCalTimeZone *tz;
   iCalDateTime *start, *end;
 
+  [self logWithFormat: @"event props:"];
+  MAPIStoreDumpMessageProperties (properties);
+
   vEvent = [self component: YES secure: NO];
   vCalendar = [vEvent parent];
   [vCalendar setProdID: @"-//Inverse inc.//OpenChange+SOGo//EN"];
 
   // summary
   value = [properties
-            objectForKey: MAPIPropertyNumber (PR_NORMALIZED_SUBJECT_UNICODE)];
+            objectForKey: MAPIPropertyKey (PR_NORMALIZED_SUBJECT_UNICODE)];
   if (value)
     [vEvent setSummary: value];
 
   // Location
-  value = [properties objectForKey: MAPIPropertyNumber (0x810c001f)];
+  value = [properties objectForKey: MAPIPropertyKey (0x810c001f)];
   if (value)
     [vEvent setLocation: value];
 
@@ -106,7 +111,7 @@
   [vCalendar addTimeZone: tz];
 
   // start
-  value = [properties objectForKey: MAPIPropertyNumber (PR_START_DATE)];
+  value = [properties objectForKey: MAPIPropertyKey (PR_START_DATE)];
   if (value)
     {
       start = (iCalDateTime *) [vEvent uniqueChildWithTag: @"dtstart"];
@@ -115,7 +120,7 @@
     }
 
   // end
-  value = [properties objectForKey: MAPIPropertyNumber (PR_END_DATE)];
+  value = [properties objectForKey: MAPIPropertyKey (PR_END_DATE)];
   if (value)
     {
       end = (iCalDateTime *) [vEvent uniqueChildWithTag: @"dtend"];
diff --git a/OpenChange/SOGoContactGCSEntry+MAPIStore.m b/OpenChange/SOGoContactGCSEntry+MAPIStore.m
index 38af14f12..cf03364b0 100644
--- a/OpenChange/SOGoContactGCSEntry+MAPIStore.m
+++ b/OpenChange/SOGoContactGCSEntry+MAPIStore.m
@@ -56,17 +56,11 @@
   [newCard setProfile: @"vCard"];
 
   value = [properties
-            objectForKey: MAPIPropertyNumber (PR_DISPLAY_NAME_UNICODE)];
-  if (!value)
-    value = [properties
-              objectForKey: MAPIPropertyNumber (PR_DISPLAY_NAME)];
-  if (!value)
-    value = [properties
-              objectForKey: MAPIPropertyNumber (PR_DISPLAY_NAME)];
+            objectForKey: MAPIPropertyKey (PR_DISPLAY_NAME_UNICODE)];
   if (value)
     [newCard setFn: value];
 
-  value = [properties objectForKey: MAPIPropertyNumber (0x81b0001f)];
+  value = [properties objectForKey: MAPIPropertyKey (0x81b0001f)];
   if (value)
     [newCard addEmail: value types: nil];
 
diff --git a/OpenChange/SOGoTaskObject+MAPIStore.h b/OpenChange/SOGoTaskObject+MAPIStore.h
index 546550acd..0a99342e7 100644
--- a/OpenChange/SOGoTaskObject+MAPIStore.h
+++ b/OpenChange/SOGoTaskObject+MAPIStore.h
@@ -6,7 +6,7 @@
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,
diff --git a/OpenChange/SOGoTaskObject+MAPIStore.m b/OpenChange/SOGoTaskObject+MAPIStore.m
index cbd9e5658..fd49aaf4a 100644
--- a/OpenChange/SOGoTaskObject+MAPIStore.m
+++ b/OpenChange/SOGoTaskObject+MAPIStore.m
@@ -6,7 +6,7 @@
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  *
  * This file is distributed in the hope that it will be useful,
@@ -115,28 +115,28 @@
 
   // summary
   value = [properties
-            objectForKey: MAPIPropertyNumber (PR_NORMALIZED_SUBJECT_UNICODE)];
+            objectForKey: MAPIPropertyKey (PR_NORMALIZED_SUBJECT_UNICODE)];
   if (value)
     [vToDo setSummary: value];
 
   // comment
   value = [properties
-            objectForKey: MAPIPropertyNumber (PR_BODY_UNICODE)];
+            objectForKey: MAPIPropertyKey (PR_BODY_UNICODE)];
   if (value)
     [vToDo setComment: value];
 
   // Location
-  value = [properties objectForKey: MAPIPropertyNumber (0x810c001f)];
+  value = [properties objectForKey: MAPIPropertyKey (0x810c001f)];
   if (value)
     [vToDo setLocation: value];
 
   /* created */
-  value = [properties objectForKey: MAPIPropertyNumber (PR_CREATION_TIME)];
+  value = [properties objectForKey: MAPIPropertyKey (PR_CREATION_TIME)];
   if (value)
     [vToDo setCreated: value];
 
   /* last-modified + dtstamp */
-  value = [properties objectForKey: MAPIPropertyNumber (PR_LAST_MODIFICATION_TIME)];
+  value = [properties objectForKey: MAPIPropertyKey (PR_LAST_MODIFICATION_TIME)];
   if (value)
     {
       [vToDo setLastModified: value];
@@ -148,7 +148,7 @@
   [vCalendar addTimeZone: tz];
 
   // start
-  value = [properties objectForKey: MAPIPropertyNumber (0x811e0040)];
+  value = [properties objectForKey: MAPIPropertyKey (0x811e0040)];
   if (value)
     {
       date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"dtstart"];
@@ -157,7 +157,7 @@
     }
 
   // due
-  value = [properties objectForKey: MAPIPropertyNumber (0x811f0040)];
+  value = [properties objectForKey: MAPIPropertyKey (0x811f0040)];
   if (value)
     {
       date = (iCalDateTime *) [vToDo uniqueChildWithTag: @"due"];
@@ -166,7 +166,7 @@
     }
 
   // status
-  value = [properties objectForKey: MAPIPropertyNumber (0x81200003)];
+  value = [properties objectForKey: MAPIPropertyKey (0x81200003)];
   if (value)
     {
       switch ([value intValue])
@@ -179,7 +179,7 @@
     }
 
   // priority
-  value = [properties objectForKey: MAPIPropertyNumber (PR_IMPORTANCE)];
+  value = [properties objectForKey: MAPIPropertyKey (PR_IMPORTANCE)];
   if (value)
     {
       switch ([value intValue])
@@ -199,7 +199,7 @@
   [vToDo setPriority: priority];
 
   // due
-  // value = [properties objectForKey: MAPIPropertyNumber (PR_DUE_DATE)];
+  // value = [properties objectForKey: MAPIPropertyKey (PR_DUE_DATE)];
   // if (value)
   //   {
   //     due = (iCalDateTime *) [vToDo uniqueChildWithTag: @"due"];