diff --git a/ChangeLog b/ChangeLog
index f932b7d08..701fede3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-04-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailAttachment.m (-): binary properties are
+	represented by a struct Binary_r.
+
+	* OpenChange/NSObject+MAPIStore.m
+	(-getMAPIValue:forTag:inMemCtx:): binary properties are
+	represented by a struct Binary_r.
+
 	* OpenChange/MAPIStoreTypes.m (NSObjectFromMAPISPropValue)
 	(NSObjectFromSPropValue): we now support PT_SVREID and handle it
 	exactly as PT_BINARY.
diff --git a/OpenChange/MAPIStoreMailAttachment.m b/OpenChange/MAPIStoreMailAttachment.m
index 8c43085dd..56ed0086b 100644
--- a/OpenChange/MAPIStoreMailAttachment.m
+++ b/OpenChange/MAPIStoreMailAttachment.m
@@ -86,7 +86,7 @@
       break;
     case PR_ATTACH_TAG:
       *data = [[self mimeAttachTag]
-		asShortBinaryInMemCtx: memCtx];
+		asBinaryInMemCtx: memCtx];
       break;
     case PR_ATTACH_SIZE:
       longValue = [[bodyInfo objectForKey: @"size"] longValue];
@@ -95,7 +95,7 @@
 
     case PR_RECORD_KEY:
       *data = [[NSData dataWithBytes: recordBytes length: 16]
-		asShortBinaryInMemCtx: memCtx];
+		asBinaryInMemCtx: memCtx];
       break;
       
       // PR_RECORD_KEY (0xFF90102)                             D9 D8 11 A3 E2 90 18 41 9E 04 58 46 9D 6D 1B 68
@@ -152,7 +152,7 @@
       break;
 
     case PR_ATTACH_DATA_BIN:
-      *data = [[sogoObject fetchBLOB] asShortBinaryInMemCtx: memCtx];
+      *data = [[sogoObject fetchBLOB] asBinaryInMemCtx: memCtx];
       break;
 
     default:
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index ce058ea30..bee3734be 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -70,7 +70,7 @@
       *data = [(NSCalendarDate * ) self asFileTimeInMemCtx: memCtx];
       break;
     case PT_BINARY:
-      *data = [(NSData *) self asShortBinaryInMemCtx: memCtx];
+      *data = [(NSData *) self asBinaryInMemCtx: memCtx];
       break;
     case PT_CLSID:
       *data = [(NSData *) self asGUIDInMemCtx: memCtx];