diff --git a/ChangeLog b/ChangeLog
index e11f32d66..863a0a4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSObject+MAPIStore.m (-getSMTPAddrType:inMemCtx:):
+	new helper getter.
+
 	* OpenChange/MAPIStoreSOGo.m
 	(sogo_message_attachment_create_embedded_message): new backend method.
 
diff --git a/OpenChange/MAPIStoreMessage.h b/OpenChange/MAPIStoreMessage.h
index b7ba24ae7..51fa56ec3 100644
--- a/OpenChange/MAPIStoreMessage.h
+++ b/OpenChange/MAPIStoreMessage.h
@@ -66,9 +66,6 @@
 - (int) setReadFlag: (uint8_t) flag;
 - (enum mapistore_error) saveMessage;
 
-/* helper getters */
-- (int) getSMTPAddrType: (void **) data
-               inMemCtx: (TALLOC_CTX *) memCtx;
 - (NSArray *) activeContainerMessageTables;
 
 - (NSArray *) activeUserRoles;
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index 1618e00c8..957cf8789 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -505,14 +505,6 @@ rtf2html (NSData *compressedRTF)
   return rc;
 }
 
-/* helper getters */
-- (int) getSMTPAddrType: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
-{
-  *data = [@"SMTP" asUnicodeInMemCtx: memCtx];
-
-  return MAPISTORE_SUCCESS;
-}
-
 /* getters */
 - (int) getPidTagInstID: (void **) data // TODO: DOUBT
                inMemCtx: (TALLOC_CTX *) memCtx
diff --git a/OpenChange/NSObject+MAPIStore.h b/OpenChange/NSObject+MAPIStore.h
index e73a983a0..8e992f958 100644
--- a/OpenChange/NSObject+MAPIStore.h
+++ b/OpenChange/NSObject+MAPIStore.h
@@ -50,6 +50,7 @@ struct MAPIStoreTallocWrapper
 - (int) getLongZero: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getYes: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
 - (int) getNo: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
+- (int) getSMTPAddrType: (void **) data inMemCtx: (TALLOC_CTX *) memCtx;
 
 @end
 
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index 2c35521b3..7eb14a768 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -168,6 +168,13 @@ MAPIStoreTallocWrapperDestroy (void *data)
   return MAPISTORE_SUCCESS;
 }
 
+- (int) getSMTPAddrType: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [@"SMTP" asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
 @end
 
 @implementation NSObject (MAPIStoreProperties)