diff --git a/data/webview.css b/data/webview.css
index a8a936d..8d4c339 100644
--- a/data/webview.css
+++ b/data/webview.css
@@ -12,21 +12,12 @@ body {
   margin: 10px;
 }
 
-h1, h2, h3 {
-  color: #7f7f7f;
-}
-
 th {
-  color: #7f7f7f;
   text-align: left;
   font-weight: normal;
   vertical-align: top;
 }
 
-.header {
-  color: #7f7f7f;
-}
-
 span.navigable, div.navigable, p.navigable {
   cursor: pointer;
   text-decoration: underline;
@@ -123,7 +114,6 @@ object { /* GtkWidgets */
 }
 
 .itip th {
-  color: #000;
   vertical-align: middle;
 }
 
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 2957f86..99b0036 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -1060,12 +1060,18 @@ e_mail_formatter_get_html_header (EMailFormatter *formatter)
 		"<title>Evolution Mail Display</title>\n"
 		"<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n"
 		"<style type=\"text/css\">\n"
-		"  table th { color: #000; font-weight: bold; }\n"
+		"  table th { color: #%06x; font-weight: bold; }\n"
 		"</style>\n"
-		"</head><body bgcolor=\"#%06x\">",
+		"</head><body bgcolor=\"#%06x\" text=\"#%06x\">",
 		e_color_to_value ((GdkColor *)
 			e_mail_formatter_get_color (
-				formatter, E_MAIL_FORMATTER_COLOR_BODY)));
+				formatter, E_MAIL_FORMATTER_COLOR_HEADER)),
+		e_color_to_value ((GdkColor *)
+			e_mail_formatter_get_color (
+				formatter, E_MAIL_FORMATTER_COLOR_BODY)),
+		e_color_to_value ((GdkColor *)
+			e_mail_formatter_get_color (
+				formatter, E_MAIL_FORMATTER_COLOR_TEXT)));
 }
 
 EMailExtensionRegistry *
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index be99ea2..21a621f 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1796,24 +1796,25 @@ void
 e_mail_display_set_status (EMailDisplay *display,
                            const gchar *status)
 {
-	gchar *str;
+	gchar *str, *header;
 
 	g_return_if_fail (E_IS_MAIL_DISPLAY (display));
 
+	header = e_mail_formatter_get_html_header (display->priv->formatter);
 	str = g_strdup_printf (
-		"<!DOCTYPE>"
-		"<html>"
-		  "<head><title>Evolution Mail Display</title></head>"
-		  "<body>"
-		    "<table border=\"0\" width=\"100%%\" height=\"100%%\">"
-		      "<tr height=\"100%%\" valign=\"middle\">"
-			"<td width=\"100%%\" align=\"center\">"
-			  "<strong>%s</strong>"
-			"</td>"
-		      "</tr>"
-		    "</table>"
-		  "</body>"
-		"</html>", status);
+		"%s\n"
+		"  <style>html, body { height: 100%%; }</style>\n"
+		"  <table border=\"0\" width=\"100%%\" height=\"100%%\">\n"
+		"    <tr height=\"100%%\" valign=\"middle\">\n"
+		"      <td width=\"100%%\" align=\"center\">\n"
+		"        <strong>%s</strong>\n"
+		"      </td>\n"
+		"    </tr>\n"
+		"  </table>\n"
+		"</body>\n"
+		"</html>\n",
+		header, status);
+	g_free (header);
 
 	e_web_view_load_string (E_WEB_VIEW (display), str);
 	g_free (str);
diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index bf64a96..c129c89 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -85,7 +85,7 @@ emfe_itip_format (EMailFormatterExtension *extension,
 	} else if (context->mode == E_MAIL_FORMATTER_MODE_RAW) {
 		buffer = g_string_sized_new (2048);
 
-		itip_view_write (buffer);
+		itip_view_write (formatter, buffer);
 
 	} else {
 		gchar *uri;
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 8e651f0..bc54c65 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -1416,15 +1416,12 @@ itip_view_set_extension_name (ItipView *view,
 }
 
 void
-itip_view_write (GString *buffer)
+itip_view_write (EMailFormatter *formatter,
+		 GString *buffer)
 {
-	g_string_append (buffer,
-		"<html>\n"
-		"<head>\n"
-		"<title>ITIP</title>\n"
-		"<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n"
-		"</head>\n"
-		"<body>\n");
+	gchar *header = e_mail_formatter_get_html_header (formatter);
+	g_string_append (buffer, header);
+	g_free (header);
 
 	g_string_append_printf (buffer,
 		"<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n",
diff --git a/modules/itip-formatter/itip-view.h b/modules/itip-formatter/itip-view.h
index 60b8b1d..90558e7 100644
--- a/modules/itip-formatter/itip-view.h
+++ b/modules/itip-formatter/itip-view.h
@@ -30,6 +30,7 @@
 #include <webkit/webkitdom.h>
 #include <libecal/libecal.h>
 #include <libedataserver/libedataserver.h>
+#include <em-format/e-mail-formatter.h>
 
 G_BEGIN_DECLS
 
@@ -100,7 +101,8 @@ ItipView *      itip_view_new                   (EMailPartItip *puri,
 						 ESourceRegistry *registry);
 void		itip_view_init_view		(ItipView *view);
 
-void            itip_view_write                 (GString *buffer);
+void            itip_view_write                 (EMailFormatter *formatter,
+						 GString *buffer);
 
 void            itip_view_write_for_printing    (ItipView *view,
                                                  GString *buffer);
