diff --git a/ChangeLog b/ChangeLog
index ba30b668a..927be6402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreAppointmentWrapper.m
+	(-getPidTagInternetCodepage:inMemCtx:): new getter for a property
+	that is sometimes requested.
+	(-getPidTagBody:inMemCtx:): we return an empty string when no
+	"description"/"comment" is actually present.
+
 2012-08-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailFolder.m (-addProperties:): make use of
diff --git a/OpenChange/MAPIStoreAppointmentWrapper.m b/OpenChange/MAPIStoreAppointmentWrapper.m
index ac7cb057b..86437006a 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.m
+++ b/OpenChange/MAPIStoreAppointmentWrapper.m
@@ -1269,11 +1269,27 @@ static NSCharacterSet *hexCharacterSet = nil;
   if ([stringValue length] > 0)
     *data = [stringValue asUnicodeInMemCtx: memCtx];
   else
-    rc = MAPISTORE_ERR_NOT_FOUND;
+    *data = [@"" asUnicodeInMemCtx: memCtx];
 
   return rc;
 }
 
+- (int) getPidTagInternetCodepage: (void **) data
+                         inMemCtx: (TALLOC_CTX *) memCtx
+{
+  /* ref:
+     http://msdn.microsoft.com/en-us/library/dd317756%28v=vs.85%29.aspx
+  
+     minimal list that should be handled:
+     us-ascii: 20127
+     iso-8859-1: 28591
+     iso-8859-15: 28605
+     utf-8: 65001 */
+  *data = MAPILongValue(memCtx, 65001);
+
+  return MAPISTORE_SUCCESS;
+}
+
 - (int) getPidLidRecurring: (void **) data
                   inMemCtx: (TALLOC_CTX *) memCtx
 {