diff --git a/ChangeLog b/ChangeLog
index 0039b49b4..d854758a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreSOGo.m (sogo_op_openmessage): added some
+	debugging.
+	(sogo_op_createmessage): takes a new "associated" flag parameter.
+
 	* OpenChange/MAPIStoreContext.m: refactored to extract the table
 	handling code into a separate class. This enables the introduction
 	of real classes for contents tables, folder tables and FAI tables,
@@ -23,6 +27,9 @@
 	to MAPIStoreTable.
 	- moved all the "evaluateRestriction:intoQualifier:" methods to
 	MAPIStoreTable.
+	(-createMessagePropertiesWithMID:inFID:isAssociated:): now takes a
+	"isAssociated" parameter to determine whether the message is part
+	of the contents table or the fai table.
 
 	* OpenChange/EOBitmaskQualifier.m (-description): new method.
 
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 49fa78ef9..479d9da2f 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -468,7 +468,11 @@ sogo_op_openmessage(void *private_data,
   context = cContext->objcContext;
   [context setupRequest];
 
+  if (!context)
+    DEBUG (5, ("  context data is empty, failure ahead..."));
   rc = [context openMessage: msg withMID: mid inFID: fid];
+  if (rc)
+    DEBUG (5, ("  failure opening message\n"));
 
   [context tearDownRequest];
   [pool release];
@@ -480,7 +484,8 @@ sogo_op_openmessage(void *private_data,
 static int
 sogo_op_createmessage(void *private_data,
 		      uint64_t fid,
-		      uint64_t mid)
+		      uint64_t mid,
+		      uint8_t associated)
 {
   NSAutoreleasePool *pool;
   sogo_context *cContext;
@@ -495,7 +500,8 @@ sogo_op_createmessage(void *private_data,
   context = cContext->objcContext;
   [context setupRequest];
 
-  rc = [context createMessagePropertiesWithMID: mid inFID: fid];
+  rc = [context createMessagePropertiesWithMID: mid inFID: fid
+				  isAssociated: associated];
 
   [context tearDownRequest];
   [pool release];
@@ -577,7 +583,8 @@ sogo_op_getprops(void *private_data,
 
   rc = [context getProperties: SPropTagArray
 		  ofTableType: type
-			inRow: aRow withMID: fmid];
+			inRow: aRow
+		      withMID: fmid];
 
   [context tearDownRequest];
   [pool release];