diff --git a/ChangeLog b/ChangeLog
index 26c3c9fcb..c71c5a775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/NSData+MAPIStore.m: (+dataWithShortBinary:): new
+	constructor for returning an NSData instance from a struct
+	SBinary_short.
+
 2010-12-02  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Main/SOGo+DAV.m - we avoid assuming a range is found
diff --git a/OpenChange/NSData+MAPIStore.h b/OpenChange/NSData+MAPIStore.h
index b82ad56d2..04101297c 100644
--- a/OpenChange/NSData+MAPIStore.h
+++ b/OpenChange/NSData+MAPIStore.h
@@ -28,6 +28,7 @@
 @interface NSData (MAPIStoreDataTypes)
 
 + (id) dataWithBinary: (const struct Binary_r *) binData;
++ (id) dataWithShortBinary: (const struct SBinary_short *) binData;
 
 - (struct Binary_r *) asBinaryInMemCtx: (void *) memCtx;
 
diff --git a/OpenChange/NSData+MAPIStore.m b/OpenChange/NSData+MAPIStore.m
index 02213c535..fd18def5a 100644
--- a/OpenChange/NSData+MAPIStore.m
+++ b/OpenChange/NSData+MAPIStore.m
@@ -34,6 +34,11 @@
   return [NSData dataWithBytes: binData->lpb length: binData->cb];
 }
 
++ (id) dataWithShortBinary: (const struct SBinary_short *) binData
+{
+  return [NSData dataWithBytes: binData->lpb length: binData->cb];
+}
+
 - (struct Binary_r *) asBinaryInMemCtx: (void *) memCtx
 {
   struct Binary_r *binary;