diff --git a/ChangeLog b/ChangeLog
index 6039c337c..9ef94919c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessage.m
+	(-getPidTagDeleteAfterSubmit:inMemCtx:): moved from
+	MAPIStoreMailMessage.
+
 	* OpenChange/MAPIStoreContactsMessage.m
 	(-getPidTagAlternateRecipientAllowed:inMemCtx:)
 	(-getPidTagMessageFlags:inMemCtx:)
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index 1fb87664e..a88e5bc04 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -1000,12 +1000,6 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
   return [self getNo: data inMemCtx: memCtx];
 }
 
-- (int) getPidTagDeleteAfterSubmit: (void **) data // TODO
-                          inMemCtx: (TALLOC_CTX *) memCtx
-{
-  return [self getNo: data inMemCtx: memCtx];
-}
-
 - (int) getPidLidGlobalObjectId: (void **) data
                        inMemCtx: (TALLOC_CTX *) memCtx
 {
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index f354930b6..325757b81 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -801,6 +801,12 @@ rtf2html (NSData *compressedRTF)
   return [self getEmptyString: data inMemCtx: memCtx];
 }
 
+- (int) getPidTagDeleteAfterSubmit: (void **) data // TODO
+                          inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getNo: data inMemCtx: memCtx];
+}
+
 - (int) getPidTagDisplayTo: (void **) data
                   inMemCtx: (TALLOC_CTX *) memCtx
 {