diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index d5154aae6..79235da87 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -144,7 +144,9 @@
 - (int) modifyPermissions: (struct PermissionData *) permissions
                 withCount: (uint16_t) pcount
                  andFlags: (int8_t) flags;
-- (enum mapistore_error) preloadMessageBodiesWithMIDs: (const struct UI8Array_r *) mids;
+- (enum mapistore_error) preloadMessageBodiesWithMIDs: (const struct UI8Array_r *) mids
+                                          ofTableType: (enum mapistore_table_type) tableType;
+
 
 /* helpers */
 - (uint64_t) idForObjectWithKey: (NSString *) childKey;
@@ -176,7 +178,8 @@
 
 - (BOOL) supportsSubFolders; /* capability */
 
-- (enum mapistore_error) preloadMessageBodiesWithKeys: (NSArray *) keys;
+- (enum mapistore_error) preloadMessageBodiesWithKeys: (NSArray *) keys
+                                          ofTableType: (enum mapistore_table_type) tableType;
 
 /* subclass helpers */
 - (void) setupVersionsMessage;
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 14950aaae..fd9774f2d 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -1754,6 +1754,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 }
 
 - (enum mapistore_error) preloadMessageBodiesWithMIDs: (const struct UI8Array_r *) mids
+                                          ofTableType: (enum mapistore_table_type) tableType
 {
   uint32_t count;
   NSMutableArray *messageKeys;
@@ -1774,10 +1775,12 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
         }
     }
 
-  return [self preloadMessageBodiesWithKeys: messageKeys];
+  return [self preloadMessageBodiesWithKeys: messageKeys
+                                ofTableType: tableType];
 }
 
 - (enum mapistore_error) preloadMessageBodiesWithKeys: (NSArray *) keys
+                                          ofTableType: (enum mapistore_table_type) tableType
 {
   return MAPISTORE_SUCCESS;
 }
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 1f3a60f45..f0dad4390 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -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 UI8Array_r *mids)
+sogo_folder_preload_message_bodies(void *folder_object, enum mapistore_table_type table_type, const struct UI8Array_r *mids)
 {
   struct MAPIStoreTallocWrapper *wrapper;
   NSAutoreleasePool *pool;
@@ -812,7 +812,8 @@ sogo_folder_preload_message_bodies(void *folder_object, const struct UI8Array_r
       folder = wrapper->instance;
       GSRegisterCurrentThread ();
       pool = [NSAutoreleasePool new];
-      rc = [folder preloadMessageBodiesWithMIDs: mids];
+      rc = [folder preloadMessageBodiesWithMIDs: mids
+                                    ofTableType: table_type];
       [pool release];
       GSUnregisterCurrentThread ();
     }