diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index bb4669c..106ca42 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1491,7 +1491,7 @@ mapi_mime_msg_body (MapiItem *item, const ExchangeMAPIStream *body)
 	camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_8BIT);
 
 	if (body && body->value && body->value->len > 0) {
-		const gchar * type = NULL;
+		const gchar *type;
 		gchar *buff = NULL;
 
 		if (item->is_cal)
@@ -1500,7 +1500,7 @@ mapi_mime_msg_body (MapiItem *item, const ExchangeMAPIStream *body)
 			type = (body->proptag == PR_BODY || body->proptag == PR_BODY_UNICODE) ?
 				"text/plain" : "text/html";
 
-		if (item->header.cpid) {
+		if (item->header.cpid && (body->proptag & 0xFFFF) != PT_UNICODE) {
 			if (item->header.cpid >= 28591 && item->header.cpid <= 28599)
 				buff = g_strdup_printf ("%s; charset=\"ISO-8859-%d\"", type, item->header.cpid % 10);
 			else if (item->header.cpid == 28603)
