diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 5205234c1..9aaa38a7b 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -372,17 +372,14 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
     {
       if ([objectURL hasPrefix: url])
         {
-          *path = [[objectURL substringFromIndex: 7]
-		    asUnicodeInMemCtx: memCtx];
-	  [self logWithFormat: @"found path '%s' for fmid %.16x",
-		*path, fmid];
+          *path = [[objectURL substringFromIndex: 7] asUnicodeInMemCtx: memCtx];
+          [self logWithFormat: @"found path '%s' for fmid %"PRIu64, *path, fmid];
           rc = MAPISTORE_SUCCESS;
         }
       else
         {
-	  [self logWithFormat: @"context (%@, %@) does not contain"
-		@" found fmid: 0x%.16x",
-		objectURL, url, fmid];
+          [self logWithFormat: @"context (%@, %@) does not contain "
+                               @"found fmid: %"PRIu64, objectURL, url, fmid];
           *path = NULL;
           rc = MAPISTORE_SUCCESS;
         }