diff --git a/ChangeLog b/ChangeLog
index 8be20de68..807d24c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (-lookupFolder:, -createMessage:):
+	assign the parent context woContext to the newly created
+	SOGoObject to enable access to "activeUser".
+
 	* SoObjects/SOGo/SOGoObject.m (-setContext, -context): new
 	accessors for the "context" ivar.
 
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 8a6dce307..7c8e568d6 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -143,12 +143,14 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 {
   MAPIStoreFolder *childFolder = nil;
   SOGoFolder *sogoFolder;
+  WOContext *woContext;
 
   if ([[self folderKeys] containsObject: folderKey])
     {
+      woContext = [[self context] woContext];
       sogoFolder = [sogoObject lookupName: folderKey
-                               inContext: nil
-                               acquire: NO];
+                                inContext: woContext
+                                  acquire: NO];
       if (sogoFolder && ![sogoFolder isKindOfClass: NSExceptionK])
         childFolder = [isa mapiStoreObjectWithSOGoObject: sogoFolder
                                              inContainer: self];
@@ -805,12 +807,15 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (MAPIStoreMessage *) createMessage: (BOOL) isAssociated
 {
   MAPIStoreMessage *newMessage;
+  WOContext *woContext;
 
   if (isAssociated)
     newMessage = [self _createAssociatedMessage];
   else
     newMessage = [self createMessage];
   [newMessage setIsNew: YES];
+  woContext = [[self context] woContext];
+  [[newMessage sogoObject] setContext: woContext];
 
   return newMessage;
 }