aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/em-format-html.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 453d753bd8..7ea7024651 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,8 +1,15 @@
+2005-02-23 Jeffrey Stedfast <fejj@novell.com>
+
+ * em-format-html.c (efh_format_header): Don't use the pre-UTF-8
+ converted subject header string from the CamelMimeMessage object,
+ decode it ourselves using the the user's override charset. Fixes
+ bug #62109.
+
2005-02-21 Not Zed <NotZed@Ximian.com>
** See bug #71528.
- * em-migrate.c (remove_system_searches, em_migrate_1_4): remove
+ * em-migrate.c (remove_system_searches, em_migrate_1_4): remove
all 'system' searches when upgrading from pre 2.0.
2005-02-21 Not Zed <NotZed@Ximian.com>
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 6a473eb0df..100a97c46d 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1529,7 +1529,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
flags |= EM_FORMAT_HEADER_BOLD | EM_FORMAT_HTML_HEADER_HTML;
} else if (!strcmp(name, "subject")) {
- txt = camel_mime_message_get_subject(msg);
+ txt = value = camel_header_decode_string (header->value, charset);
label = _("Subject");
flags |= EM_FORMAT_HEADER_BOLD;
} else if (!strcmp(name, "x-evolution-mailer")) {