diff --git a/ChangeLog b/ChangeLog
index d2ec816d3..787e21da1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreNotesMessage.m
+	(-getPrMessageClass:inMemCtx:): explicit method.
+	(-getPrSubject:inMemCtx:): explicit method.
+
 	* OpenChange/MAPIStoreMessage.m (-getPrAccess:inMemCtx:)
 	(-getPrAccessLevel:inMemCtx:): reimplemented methods in a generic
 	way just like the MAPIStoreFolder versions.
diff --git a/OpenChange/MAPIStoreNotesMessage.m b/OpenChange/MAPIStoreNotesMessage.m
index 825e167a1..3933c167e 100644
--- a/OpenChange/MAPIStoreNotesMessage.m
+++ b/OpenChange/MAPIStoreNotesMessage.m
@@ -20,7 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+
 #import "MAPIStoreTypes.h"
+#import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
 
 #import "MAPIStoreNotesMessage.h"
 
@@ -42,12 +46,28 @@
   return MAPISTORE_SUCCESS;
 }
 
+- (int) getPrMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [@"IPM.StickyNote" asUnicodeInMemCtx: memCtx];
+
+  return MAPISTORE_SUCCESS;
+}
+
 - (int) getPrSubject: (void **) data
             inMemCtx: (TALLOC_CTX *) memCtx
 {
-  return [self getProperty: data
-                   withTag: PR_NORMALIZED_SUBJECT_UNICODE
-                  inMemCtx: memCtx];
+  id value;
+  int rc;
+ 
+  value = [[sogoObject properties]
+            objectForKey: MAPIPropertyKey (PR_NORMALIZED_SUBJECT_UNICODE)];
+  if (value)
+    rc = [value getValue: data forTag: PR_NORMALIZED_SUBJECT_UNICODE
+                inMemCtx: memCtx];
+  else
+    rc = MAPISTORE_ERR_NOT_FOUND;
+
+  return rc;
 }
 
 @end