diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index 455ac1a76..9920b664e 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -28,6 +28,7 @@
 #import <Foundation/NSObject.h>
 
 @class NSCalendarDate;
+@class NSData;
 @class NSString;
 @class NSMutableArray;
 @class NSMutableDictionary;
@@ -100,6 +101,7 @@
            inMemCtx: (TALLOC_CTX *) localMemCtx;
 
 /* helper getters */
+- (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt;
 - (int) getReplicaKey: (void **) data
           fromGlobCnt: (uint64_t) objectCnt
              inMemCtx: (TALLOC_CTX *) memCtx;
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index 2be8f1a72..d9f6e2820 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -277,9 +277,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
 }
 
 /* helper getters */
-- (int) getReplicaKey: (void **) data
-          fromGlobCnt: (uint64_t) objectCnt
-             inMemCtx: (TALLOC_CTX *) memCtx
+- (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt
 {
   struct mapistore_connection_info *connInfo;
   NSMutableData *replicaKey;
@@ -297,9 +295,16 @@ static Class NSExceptionK, MAPIStoreFolderK;
   replicaKey = [NSMutableData dataWithCapacity: 22];
   [replicaKey appendBytes: &connInfo->replica_guid
                    length: sizeof (struct GUID)];
-  [replicaKey appendBytes: buffer
-                   length: 6];
-  *data = [replicaKey asBinaryInMemCtx: memCtx];
+  [replicaKey appendBytes: buffer length: 6];
+
+  return replicaKey;
+}
+
+- (int) getReplicaKey: (void **) data
+          fromGlobCnt: (uint64_t) objectCnt
+             inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [[self getReplicaKeyFromGlobCnt: objectCnt] asBinaryInMemCtx: memCtx];
 
   return MAPISTORE_SUCCESS;
 }