Monotone-Parent: a9261ceaf48e76c37620492b143b43b5c3a4c59a

Monotone-Revision: f7e22c2902aad2294bce4bf4189092795fafd616

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-20T18:21:12
Monotone-Branch: ca.inverse.sogo

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;
 }