[evolution/gnome-3-4] Bug #669111 - Lost charset in replies to encrypted mails

[Milan Crha <mcrha src gnome org>]

commit f991624bce67560890df03b49b51bb38ab655a3c
Author: Milan Crha <mcrha redhat com>
Date:   Fri May 4 12:04:23 2012 +0200

    Bug #669111 - Lost charset in replies to encrypted mails

 em-format/em-format.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 06582c5..f1cbef4 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -1542,8 +1542,14 @@ preserve_charset_in_content_type (CamelMimePart *ipart,
 
 	data_wrapper = camel_medium_get_content (CAMEL_MEDIUM (opart));
 	content_type = camel_data_wrapper_get_mime_type_field (data_wrapper);
+	if (content_type)
+		camel_content_type_set_param (content_type, "charset", charset);
 
-	camel_content_type_set_param (content_type, "charset", charset);
+	/* update charset also on the part itself */
+	data_wrapper = CAMEL_DATA_WRAPPER (opart);
+	content_type = camel_data_wrapper_get_mime_type_field (data_wrapper);
+	if (content_type)
+		camel_content_type_set_param (content_type, "charset", charset);
 }
 
 #ifdef ENABLE_SMIME