diff --git a/ChangeLog b/ChangeLog
index e1312c0b1..72ddffa48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-10-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContext.m
+	(-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:):
+	added missing "break" statement, leading PR_FID to get the value
+	of PR_MID.
+
 	* OpenChange/MAPIStoreMapping.m (-registerURL:): commented method out.
 	(-_setupFixedMapping): new method that registers well-known ids
 	with well-known urls.
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 9f61e0b33..a4d551bc6 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -641,6 +641,7 @@ static MAPIStoreMapping *mapping = nil;
       break;
     case PR_FID:
       *data = MAPILongLongValue (memCtx, fid);
+      break;
     case PR_MID:
       mappingId = [mapping idFromURL: childURL];
       if (mappingId == NSNotFound)