diff --git a/ChangeLog b/ChangeLog
index 927be6402..f030d098f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMapping.m (_updateFolderWithURL:withURL:):
+	we retain and release "oldURL" to avoid releasing it when it
+	is replaced in the list of urls to modify.
+
 	* OpenChange/MAPIStoreAppointmentWrapper.m
 	(-getPidTagInternetCodepage:inMemCtx:): new getter for a property
 	that is sometimes requested.
diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index 36c4dc9a3..448ef1d1b 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -215,6 +215,8 @@ MAPIStoreMappingTDBTraverse (TDB_CONTEXT *ctx, TDB_DATA data1, TDB_DATA data2,
   NSNumber *idKey;
   TDB_DATA key, dbuf;
 
+  [oldURL retain];
+
   allKeys = [reverseMapping allKeys];
   max = [allKeys count];
   for (count = 0; count < max; count++)
@@ -243,6 +245,8 @@ MAPIStoreMappingTDBTraverse (TDB_CONTEXT *ctx, TDB_DATA data1, TDB_DATA data2,
           talloc_free (dbuf.dptr);
         }
     }
+
+  [oldURL release];
 }
 
 - (void) updateID: (uint64_t) idNbr