diff --git a/ChangeLog b/ChangeLog
index a92f140cb..75933372a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessage.m
+	(_convertRecipientFromRow:andColumns:): temp hack: make use of
+	set_mapi_SPropValue_sogo instead of set_mapi_SPropValue, which was
+	reversed in openchange to the old behaviour.
+
 	* OpenChange/MAPIStoreObject.m (-init): renamed "newProperties"
 	ivar to "properties".
 	(-addNewProperties:): renamed to "-addProperties:"
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index 2af0e44b2..8bf5cbd24 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -282,7 +282,7 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
           else
             dataPos++;
         }
-      set_mapi_SPropValue (memCtx, &mapiValue, row->prop_values.data + dataPos);
+      set_mapi_SPropValue_sogo (memCtx, &mapiValue, row->prop_values.data + dataPos);
       value = NSObjectFromMAPISPropValue (&mapiValue);
       dataPos += get_mapi_property_size (&mapiValue);
       if (value)