diff --git a/ChangeLog b/ChangeLog
index 8c9427e48..c25de6398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailMessage.m: (-getPrExpiryTime:) removed
+	method as we don't want the message to appear as "expired".
+	(-getPrOriginalSensitivity:): uppercased the "o" in "getPrOriginal..."
+
 	* OpenChange/MAPIStoreSOGo.m
 	(sogo_pocop_get_available_table_properties): now takes a
 	SPropTagArray ** argument.
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index 57abdd47d..65ccb36d7 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -285,25 +285,11 @@ static Class NSExceptionK, MAPIStoreSentItemsFolderK, MAPIStoreDraftsFolderK;
   return [self getLongZero: data];
 }
 
-- (int) getProriginalSensitivity: (void **) data // TODO
+- (int) getPrOriginalSensitivity: (void **) data // TODO
 {
   return [self getPrSensitivity: data];
 }
 
-- (int) getPrExpiryTime: (void **) data // TODO
-{
-  *data = [[NSCalendarDate date] asFileTimeInMemCtx: memCtx];
-
-  return MAPISTORE_SUCCESS;
-}
-
-// - (int) getPrReplyTime: (void **) data // TODO
-// {
-//   *data = [[NSCalendarDate date] asFileTimeInMemCtx: memCtx];
-
-//   return MAPISTORE_SUCCESS;
-// }
-
 - (int) getPrSentRepresentingAddrtype: (void **) data
 {
   return [self getSMTPAddrType: data];