diff --git a/ChangeLog b/ChangeLog
index 7dd27b4ef..c60583dfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (-lookupMessage:): set the WOContext
+	of the resulting SOGoObject to the value attached to the current
+	MAPIStoreContext.
+
 	* OpenChange/MAPIStoreCalendarMessageTable.m
 	(-evaluatePropertyRestriction:intoQualifier:): implemented
 	searches on PR_OWNER_APPT_ID in order to enable the retrieval of
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index c1159f346..ea7943800 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -200,9 +200,12 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
                                inContext: nil
                                  acquire: NO];
       if (msgObject && ![msgObject isKindOfClass: NSExceptionK])
-        childMessage
-          = [[self messageClass] mapiStoreObjectWithSOGoObject: msgObject
-                                                   inContainer: self];
+        {
+          [msgObject setContext: [[self context] woContext]];
+          childMessage
+            = [[self messageClass] mapiStoreObjectWithSOGoObject: msgObject
+                                                     inContainer: self];
+        }
     }
 
   return childMessage;