diff --git a/ChangeLog b/ChangeLog
index 2382a5c26..b87f66544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSObject+MAPIStore.m
+	(-getMAPIValue:forTag:inMemCtx:): added case to handle PT_I8
+	properties via the new method below.
+
 	* OpenChange/NSValue+MAPIStore.m (-asI8InMemCtx:): new method that
 	extracts an uint64_t from an NSNumber.
 
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index 772816e1f..a23d3c080 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -56,6 +56,9 @@
     case PT_LONG:
       *data = [(NSNumber *) self asLongInMemCtx: memCtx];
       break;
+    case PT_I8:
+      *data = [(NSNumber *) self asI8InMemCtx: memCtx];
+      break;
     case PT_BOOLEAN:
       *data = [(NSNumber *) self asBooleanInMemCtx: memCtx];
       break;