diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index af1ec59..23a02fc 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -1880,7 +1880,7 @@ gpg_decrypt (CamelCipherContext *context,
 		return NULL;
 	}
 
-	ct = camel_mime_part_get_content_type((CamelMimePart *)content);
+	ct = camel_data_wrapper_get_mime_type_field (content);
 	/* Encrypted part (using our fake mime type) or PGP/Mime multipart */
 	if (camel_content_type_is(ct, "multipart", "encrypted")) {
 		mp = (CamelMultipart *) camel_medium_get_content ((CamelMedium *) ipart);
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index af0823b..80ce93f 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -1219,7 +1219,7 @@ camel_mime_part_get_content_type (CamelMimePart *mime_part)
 {
 	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);
 
-	return ((CamelDataWrapper *) mime_part)->mime_type;
+	return camel_data_wrapper_get_mime_type_field ((CamelDataWrapper *) mime_part);
 }
 
 /**
