diff --git a/ChangeLog b/ChangeLog
index 8fe215897..d88087c3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContext.m (-openMessage:forKey:inTable:):
+	only return PR_SUBJECT_PREFIX_UNICODE,
+	PR_NORMALIZED_SUBJECT_UNICODE as those are the only fields
+	required by the doc.
+
 	* OpenChange/MAPIStoreMailMessageTable.m
 	(-getChildProperty:forKey:withTag:): handle PR_FLAG_STATUS and
 	PR_FOLLOWUP_ICON based on the "Flagged" message flag.
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 96e3184c0..93a942f58 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -775,12 +775,8 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
 	     forKey: (NSString *) childKey
 	    inTable: (MAPIStoreTable *) table
 {
-  static enum MAPITAGS tags[] = { PR_SUBJECT_UNICODE, PR_HASATTACH,
-				  PR_MESSAGE_DELIVERY_TIME, PR_MESSAGE_FLAGS,
-				  PR_FLAG_STATUS, PR_SENSITIVITY,
-				  PR_SENT_REPRESENTING_NAME_UNICODE,
-				  PR_INTERNET_MESSAGE_ID_UNICODE,
-				  PR_READ_RECEIPT_REQUESTED };
+  static enum MAPITAGS tags[] = { PR_SUBJECT_PREFIX_UNICODE,
+                                  PR_NORMALIZED_SUBJECT_UNICODE };
   struct SRowSet *recipients;
   struct SRow *properties;
   NSInteger count, max;
@@ -795,7 +791,7 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
   recipients->aRow = NULL;
   msg->recipients = recipients;
 
-  max = 9;
+  max = 2;
   properties = talloc_zero (memCtx, struct SRow);
   properties->cValues = 0;
   properties->ulAdrEntryPad = 0;