diff --git a/ChangeLog b/ChangeLog
index 62633c708..cdd310b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreFolder.m (-createFolder:withRow:andFID:):
+	fixed referencing of resulting folder.
+
 2011-07-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreSOGo.m: finalized the new API.
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 83fa33b4f..902055802 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -294,11 +294,14 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
           [mapping registerURL: childURL withID: fid];
           childFolder = [self lookupFolder: folderKey];
           if (childFolder)
-            [childFolder setProperties: aRow];
+            {
+              [childFolder setProperties: aRow];
+              *childFolderPtr = childFolder;
+              rc = MAPISTORE_SUCCESS;
+            }
           else
             [NSException raise: @"MAPIStoreIOException"
                         format: @"unable to fetch created folder"];
-          rc = MAPISTORE_SUCCESS;
         }
       else
         rc = MAPISTORE_ERROR;