[evolution/webkit: 120/171] Convert short headers subject to HTML and preserve 8bit encoding

[Dan VrÃtil <dvratil src gnome org>]

commit dab399037bffa9695cea532821cf66d2aa51c2ec
Author: Dan VrÃtil <dan progdan cz>
Date:   Wed Jan 18 21:10:51 2012 +0100

    Convert short headers subject to HTML and preserve 8bit encoding
    
    8bit encoded subjects are now correctly displayed in short headers view

 mail/em-format-html.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 23d67ab..8a2e7e9 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2200,10 +2200,11 @@ efh_format_short_headers (EMFormatHTML *efh,
 
 		} else if (!g_ascii_strcasecmp (header->name, "Subject")) {
 			gchar *buf = NULL;
-			buf = camel_header_unfold (header->value);
+			subject = camel_header_unfold (header->value);
+			buf = camel_header_decode_string (subject, hdr_charset);
 			g_free (subject);
-			subject = camel_header_decode_string (buf, hdr_charset);
-			g_free (buf);
+                        subject = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0);
+                        g_free (buf);
 		}
 		header = header->next;
 	}