aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-mime-message.c
diff options
context:
space:
mode:
Diffstat (limited to 'camel/camel-mime-message.c')
-rw-r--r--camel/camel-mime-message.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index cbae7fb3f1..13182093b7 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -531,7 +531,10 @@ process_header (CamelMedium *medium, const char *header_name, const char *header
break;
case HEADER_SUBJECT:
g_free (message->subject);
- charset = camel_charset_locale_name ();
+ if (((CamelMimePart *)message)->content_type)
+ charset = camel_charset_to_iconv(header_content_type_param(((CamelMimePart *)message)->content_type, "charset"));
+ else
+ charset = NULL;
message->subject = g_strstrip (header_decode_string (header_value, charset));
break;
case HEADER_TO: