diff --git a/ChangeLog b/ChangeLog
index b87f66544..20bbaff23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTypes.m (NSObjectFromMAPISPropValue)
+	(NSObjectFromSPropValue): handle PT_I8 properties.
+
 	* OpenChange/NSObject+MAPIStore.m
 	(-getMAPIValue:forTag:inMemCtx:): added case to handle PT_I8
 	properties via the new method below.
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index e063bbbd3..95f5614ef 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -95,13 +95,16 @@ NSObjectFromMAPISPropValue (const struct mapi_SPropValue *value)
       result = [NSNull null];
       break;
     case PT_SHORT:
-      result = [NSNumber numberWithShort: value->value.i];
+      result = [NSNumber numberWithUnsignedShort: value->value.i];
       break;
     case PT_LONG:
-      result = [NSNumber numberWithLong: value->value.l];
+      result = [NSNumber numberWithUnsignedLong: value->value.l];
+      break;
+    case PT_I8:
+      result = [NSNumber numberWithUnsignedLongLong: value->value.d];
       break;
     case PT_BOOLEAN:
-      result = [NSNumber numberWithInt: (value->value.b ? 1 : 0)];
+      result = [NSNumber numberWithBool: (value->value.b ? YES : NO)];
       break;
     case PT_DOUBLE:
       result = [NSNumber numberWithDouble: value->value.dbl];
@@ -160,8 +163,11 @@ NSObjectFromSPropValue (const struct SPropValue *value)
     case PT_LONG:
       result = [NSNumber numberWithLong: value->value.l];
       break;
+    case PT_I8:
+      result = [NSNumber numberWithUnsignedLongLong: value->value.d];
+      break;
     case PT_BOOLEAN:
-      result = [NSNumber numberWithInt: (value->value.b ? 1 : 0)];
+      result = [NSNumber numberWithBool: (value->value.b ? YES : NO)];
       break;
     case PT_DOUBLE:
       result = [NSNumber numberWithDouble: value->value.dbl];