diff --git a/ChangeLog b/ChangeLog
index 62ea57cdd..e16bf2594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTypes.m (NSObjectFromSPropValue)
+	(NSObjectFromMAPISPropValue): force booleans to be int to avoid
+	creating EOQualifier values where the strings "YES" or "NO" appear
+	as a result to "stringValue".
+
 	* OpenChange/SOGoTaskObject+MAPIStore.m
 	(-setMAPIProperties:): same as below.
 
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index fc8735bff..4ffa6eb38 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -101,7 +101,7 @@ NSObjectFromMAPISPropValue (const struct mapi_SPropValue *value)
       result = [NSNumber numberWithLong: value->value.l];
       break;
     case PT_BOOLEAN:
-      result = [NSNumber numberWithBool: value->value.b];
+      result = [NSNumber numberWithInt: (value->value.b ? 1 : 0)];
       break;
     case PT_DOUBLE:
       result = [NSNumber numberWithDouble: value->value.dbl];
@@ -160,7 +160,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
       result = [NSNumber numberWithLong: value->value.l];
       break;
     case PT_BOOLEAN:
-      result = [NSNumber numberWithBool: value->value.b];
+      result = [NSNumber numberWithInt: (value->value.b ? 1 : 0)];
       break;
     case PT_DOUBLE:
       result = [NSNumber numberWithDouble: value->value.dbl];