diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index ee660ba02..78e24be30 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -128,7 +128,7 @@
                                    isMove: (BOOL) isMove
                               isRecursive: (BOOL) isRecursive;
 
-- (int) getDeletedFMIDs: (struct I8Array_r **) fmidsPtr
+- (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
                   andCN: (uint64_t *) cnPtr
        fromChangeNumber: (uint64_t) changeNum
             inTableType: (enum mapistore_table_type) tableType
@@ -142,7 +142,7 @@
 - (int) modifyPermissions: (struct PermissionData *) permissions
                 withCount: (uint16_t) pcount
                  andFlags: (int8_t) flags;
-- (enum mapistore_error) preloadMessageBodies: (const struct I8Array_r *) mids;
+- (enum mapistore_error) preloadMessageBodies: (const struct UI8Array_r *) mids;
 
 /* helpers */
 - (uint64_t) idForObjectWithKey: (NSString *) childKey;
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 18fdecce5..69fb5031d 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -1016,7 +1016,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
     }
 }
 
-- (int) getDeletedFMIDs: (struct I8Array_r **) fmidsPtr
+- (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
                   andCN: (uint64_t *) cnPtr
        fromChangeNumber: (uint64_t) changeNum
             inTableType: (enum mapistore_table_type) tableType
@@ -1028,7 +1028,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   NSNumber *cnNbr;
   NSUInteger count, max;
   MAPIStoreMapping *mapping;
-  struct I8Array_r *fmids;
+  struct UI8Array_r *fmids;
   uint64_t fmid;
 
   keys = [self getDeletedKeysFromChangeNumber: changeNum andCN: &cnNbr
@@ -1039,9 +1039,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 
       max = [keys count];
 
-      fmids = talloc_zero (memCtx, struct I8Array_r);
+      fmids = talloc_zero (memCtx, struct UI8Array_r);
       fmids->cValues = 0;
-      fmids->lpi8 = talloc_array (fmids, int64_t, max);
+      fmids->lpui8 = talloc_array (fmids, uint64_t, max);
       *fmidsPtr = fmids;
       if (max > 0)
         *cnPtr = [cnNbr unsignedLongLongValue];
@@ -1061,7 +1061,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
                                      "never existed" in the OpenChange
                                      databases */
             {
-              fmids->lpi8[fmids->cValues] = fmid;
+              fmids->lpui8[fmids->cValues] = fmid;
               fmids->cValues++;
             }
         }
@@ -1751,7 +1751,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   return MAPISTORE_SUCCESS;
 }
 
-- (enum mapistore_error) preloadMessageBodies: (const struct I8Array_r *) mids
+- (enum mapistore_error) preloadMessageBodies: (const struct UI8Array_r *) mids
 {
   return MAPISTORE_SUCCESS;
 }
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 82565ad60..a51382d69 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -697,7 +697,7 @@ sogo_folder_copy_folder(void *folder_object, void *target_folder_object,
 static enum mapistore_error
 sogo_folder_get_deleted_fmids(void *folder_object, TALLOC_CTX *mem_ctx,
                               enum mapistore_table_type table_type, uint64_t change_num,
-                              struct I8Array_r **fmidsp, uint64_t *cnp)
+                              struct UI8Array_r **fmidsp, uint64_t *cnp)
 {
   struct MAPIStoreTallocWrapper *wrapper;
   NSAutoreleasePool *pool;
@@ -797,7 +797,7 @@ sogo_folder_modify_permissions(void *folder_object, uint8_t flags,
 }
 
 static enum mapistore_error
-sogo_folder_preload_message_bodies(void *folder_object, const struct I8Array_r *mids)
+sogo_folder_preload_message_bodies(void *folder_object, const struct UI8Array_r *mids)
 {
   struct MAPIStoreTallocWrapper *wrapper;
   NSAutoreleasePool *pool;
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 43fa048ee..8903eba73 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -222,7 +222,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
       result = [NSArray arrayFromMVLong: &value->value.MVl];
       break;
     case PT_MV_I8:
-      result = [NSArray arrayFromMVI8: &value->value.MVi8];
+      result = [NSArray arrayFromMVUI8: &value->value.MVui8];
       break;
     case PT_MV_STRING8:
       result = [NSArray arrayFromMVString: &value->value.MVszA];
diff --git a/OpenChange/NSArray+MAPIStore.h b/OpenChange/NSArray+MAPIStore.h
index 6bcf5f01d..a61bc4bc3 100644
--- a/OpenChange/NSArray+MAPIStore.h
+++ b/OpenChange/NSArray+MAPIStore.h
@@ -37,7 +37,7 @@
 + (id) arrayFromMVShort: (const struct ShortArray_r *) mvShort;
 + (id) arrayFromMVLong: (const struct LongArray_r *) mvLong;
 - (struct LongArray_r *) asMVLongInMemCtx: (void *) memCtx;
-+ (id) arrayFromMVI8: (const struct I8Array_r *) mvI8;
++ (id) arrayFromMVUI8: (const struct UI8Array_r *) mvI8;
 + (id) arrayFromMVString: (const struct StringArray_r *) mvString;
 + (id) arrayFromMVUnicode: (const struct StringArrayW_r *) mvUnicode;
 - (struct StringArrayW_r *) asMVUnicodeInMemCtx: (void *) memCtx;
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index 9ed20130a..fcb7d3896 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -170,16 +170,16 @@
   return list;
 }
 
-+ (id) arrayFromMVI8: (const struct I8Array_r *) mvI8
++ (id) arrayFromMVUI8: (const struct UI8Array_r *) mvUI8
 {
   NSUInteger count;
   NSNumber *subObject;
   NSMutableArray *mvResult;
 
-  mvResult = [NSMutableArray arrayWithCapacity: mvI8->cValues];
-  for (count = 0; count < mvI8->cValues; count++)
+  mvResult = [NSMutableArray arrayWithCapacity: mvUI8->cValues];
+  for (count = 0; count < mvUI8->cValues; count++)
     {
-      subObject = [NSNumber numberWithLongLong: mvI8->lpi8[count]];
+      subObject = [NSNumber numberWithLongLong: mvUI8->lpui8[count]];
       [mvResult addObject: subObject];
     }