diff --git a/ChangeLog b/ChangeLog
index 7a1427362..d089cdded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTypes.h (MAPIPropertyNumber): changed the
+	prototype to use an enum MAPITAGS instead of an int32_t.
+
 	* OpenChange/MAPIStoreContext.m
 	(-getFolderTableChildproperty:atURL:withTag:inFolder:withFID:,-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:)
 	(-getCommonTableChildproperty:atURL:withTag:inFolder:withFID:):
diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h
index f19180aaa..79bea8c21 100644
--- a/OpenChange/MAPIStoreTypes.h
+++ b/OpenChange/MAPIStoreTypes.h
@@ -38,21 +38,17 @@ uint64_t *MAPILongLongValue (void *memCtx, uint64_t value);
 id NSObjectFromSPropValue (const struct SPropValue *);
 id NSObjectFromStreamData (enum MAPITAGS property, NSData *streamData);
 
+static inline NSNumber *
+MAPIPropertyNumber (enum MAPITAGS propTag)
+{
 #if (GS_SIZEOF_LONG == 4)
-static inline NSNumber *
-MAPIPropertyNumber (unsigned long propTag)
-{
   return [NSNumber numberWithUnsignedLong: propTag];
-}
 #elif (GS_SIZEOF_INT == 4)
-static inline NSNumber *
-MAPIPropertyNumber (unsigned int propTag)
-{
   return [NSNumber numberWithUnsignedInt: propTag];
-}
 #else
 #error No suitable type for 4 bytes integers
 #endif
+}
 
 void MAPIStoreDumpMessageProperties (NSDictionary *properties);