diff --git a/ChangeLog b/ChangeLog
index 5bb792d7f..119d33f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailFolder.m
+	(-getPidTagMessageClass:inMemCtx:): removed method, as folders are
+	not supposed to return a PidTagMessageClass attribute.
+
 	* OpenChange/MAPIStoreGCSFolder.m
 	(-predecessorChangeListForMessageWithKey:): same as below.
 
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index e1db52f07..f5cfe3340 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -218,21 +218,13 @@ static Class SOGoMailFolderK, MAPIStoreOutboxFolderK;
 }
 
 - (int) getPidTagContainerClass: (void **) data
-                   inMemCtx: (TALLOC_CTX *) memCtx
+                       inMemCtx: (TALLOC_CTX *) memCtx
 {
   *data = [@"IPF.Note" asUnicodeInMemCtx: memCtx];
   
   return MAPISTORE_SUCCESS;
 }
 
-- (int) getPidTagMessageClass: (void **) data
-                 inMemCtx: (TALLOC_CTX *) memCtx
-{
-  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];
-  
-  return MAPISTORE_SUCCESS;
-}
-
 - (EOQualifier *) nonDeletedQualifier
 {
   static EOQualifier *nonDeletedQualifier = nil;