[anjal] Fix more with webkit rendering.

[Srinivasa Ragavan <sragavan src gnome org>]

commit f0bf69cbe418ebf2acae68b262bb5d5c63916e8e
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Tue Jun 16 19:32:46 2009 +0530

    Fix more with webkit rendering.

 src/em-format-mail-display.c |    3 +++
 src/em-format-mail.c         |   10 +++-------
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/em-format-mail-display.c b/src/em-format-mail-display.c
index 1353a98..75ea7d0 100644
--- a/src/em-format-mail-display.c
+++ b/src/em-format-mail-display.c
@@ -1642,6 +1642,9 @@ efhd_message_add_bar (EMFormat *efh,
 	struct _attach_puri *ainfo;
 	EMFormatMailPObject *pobject;
 
+	if (((EMFormatMailDisplay *)efh)->priv->attachment_view)
+		return;
+
 	ainfo = (struct _attach_puri *)em_format_add_puri((EMFormat *)efh, sizeof(*ainfo), classid, part, efhd_attachment_frame);
 	pobject = em_format_mail_add_pobject (
 			(EMFormatMail *) efh,
diff --git a/src/em-format-mail.c b/src/em-format-mail.c
index bef0b11..c323241 100644
--- a/src/em-format-mail.c
+++ b/src/em-format-mail.c
@@ -1886,15 +1886,11 @@ efh_format_headers(EMFormatMail *efh, CamelStream *stream, CamelMedium *part)
 	charset = camel_content_type_param (ct, "charset");
 	charset = camel_iconv_charset_name(charset);
 
-//	if (!efh->simple_headers)
-//		camel_stream_printf(stream,
-//				    "<font color=\"#%06x\">\n"
-//				    "<table cellpadding=\"0\" width=\"100%%\">",
-//				    efh->header_colour & 0xffffff);
 	if (!efh->simple_headers)
 		camel_stream_printf(stream,
-				    "<table cellpadding=\"0\" width=\"100%%\">");
-
+				    "<font color=\"#%06x\">\n"
+				    "<table cellpadding=\"0\" width=\"100%%\">",
+				    efh->header_colour & 0xffffff);
 
 	hdr_charset = emf->charset ? emf->charset : emf->default_charset;