diff --git a/ChangeLog b/ChangeLog
index 5597515e4..dd334e70b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFSFolder.m (-createMessage): fixed typo that
+	was making contents messages saved in the FAI folder.
+
 	* OpenChange/MAPIStoreContext.m (_prepareContextClass): now takes
 	the context fid as argument.
 
diff --git a/OpenChange/MAPIStoreFSFolder.m b/OpenChange/MAPIStoreFSFolder.m
index 47ad71dcd..81979fe22 100644
--- a/OpenChange/MAPIStoreFSFolder.m
+++ b/OpenChange/MAPIStoreFSFolder.m
@@ -79,7 +79,7 @@ static Class MAPIStoreFSMessageK;
 
   newKey = [NSString stringWithFormat: @"%@.plist",
                      [SOGoObject globallyUniqueObjectId]];
-  fsObject = [SOGoMAPIFSMessage objectWithName: newKey inContainer: faiFolder];
+  fsObject = [SOGoMAPIFSMessage objectWithName: newKey inContainer: sogoObject];
   newMessage = [MAPIStoreFSMessage mapiStoreObjectWithSOGoObject: fsObject
                                                      inContainer: self];