diff options
-rw-r--r-- | mail/ChangeLog | 3 | ||||
-rw-r--r-- | mail/mail-format.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3327d5584a..55e6dd1824 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2000-10-05 Jeffrey Stedfast <fejj@helixcode.com> + * mail-format.c (write_field_to_stream): Decode the header before + writing it to the header box. + * mail-callbacks.c (send_receieve_mail): fetch mail before sending, this is a temp fix for POP-before-SMTP authentication. diff --git a/mail/mail-format.c b/mail/mail-format.c index 79a49bde74..5d7cb1f695 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -29,6 +29,7 @@ #include "mail.h" #include "shell/e-setup.h" #include "e-util/e-html-utils.h" +#include <camel/camel-mime-utils.h> #include <libgnome/libgnome.h> #include <libgnomevfs/gnome-vfs-mime-info.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> @@ -546,11 +547,14 @@ write_field_to_stream (const char *description, const char *value, char *encoded_value; if (value) { - unsigned char *p; + unsigned char *raw, *p; - encoded_value = e_text_to_html (value, + raw = header_decode_string (value); + + encoded_value = e_text_to_html (raw, E_TEXT_TO_HTML_CONVERT_NL | E_TEXT_TO_HTML_CONVERT_URLS); + g_free (raw); for (p = (unsigned char *)encoded_value; *p; p++) { if (!isprint (*p)) *p = '?'; |