diff --git a/ChangeLog b/ChangeLog
index 70085e95f..54264be16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessageTable.m
+	(-getChildProperty:forKey:withTag:): removed PR_MESSAGE_CODEPAGE
+	and PR_INTERNET_CPID.
+
 	* OpenChange/MAPIStoreMailMessageTable.m
 	(-getChildProperty:forKey:withTag:): removed non-unicode string
 	proptags. Added support for case
@@ -13,6 +17,8 @@
 	values where larger than 3999 bytes.
 	(_sortIdentifierForProperty:): enabled sorting on
 	PR_CLIENT_SUBMIT_TIME.
+	Added support for PR_INTERNET_CPID, currently returning "utf-8"
+	only (65001).
 
 2011-02-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m
index 26c1dcddf..bab300c5e 100644
--- a/OpenChange/MAPIStoreMailMessageTable.m
+++ b/OpenChange/MAPIStoreMailMessageTable.m
@@ -374,6 +374,18 @@ static EOQualifier *nonDeletedQualifier = nil;
       }
       break;
       
+    case PR_INTERNET_CPID:
+      /* 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);
+      break;
+      
     case PR_HTML:
       {
         NSMutableArray *keys;
diff --git a/OpenChange/MAPIStoreMessageTable.m b/OpenChange/MAPIStoreMessageTable.m
index b91d26635..b7766a795 100644
--- a/OpenChange/MAPIStoreMessageTable.m
+++ b/OpenChange/MAPIStoreMessageTable.m
@@ -138,10 +138,6 @@ static MAPIStoreMapping *mapping;
         }
       *data = MAPILongLongValue (memCtx, mappingId);
       break;
-    case PR_MESSAGE_CODEPAGE:
-    case PR_INTERNET_CPID:
-      *data = MAPILongValue (memCtx, 1200);
-      break;
     case PR_MESSAGE_LOCALE_ID:
       *data = MAPILongValue (memCtx, 0x0409);
       break;