X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-gtkhtml-mime-part-view.c;h=5d6cb6f5d586bdebaf857bbd9b4bb69ddf0e467e;hp=499e13eb41b400633b75961e7db2479e6a207f6a;hb=aec82dc1d28191037d46634758d11103861ffeb4;hpb=004e051469e80cc145ee2fb886682bd1ff07b213

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index 499e13e..5d6cb6f 100644
--- a/src/widgets/modest-gtkhtml-mime-part-view.c
+++ b/src/widgets/modest-gtkhtml-mime-part-view.c
@@ -34,6 +34,7 @@
 #include <gtkhtml/gtkhtml-search.h>
 #include <tny-stream.h>
 #include <tny-mime-part-view.h>
+#include "modest-tny-mime-part.h"
 #include <modest-stream-text-to-html.h>
 #include <modest-text-utils.h>
 #include <modest-conf.h>
@@ -42,6 +43,7 @@
 #include <widgets/modest-zoomable.h>
 #include <widgets/modest-tny-stream-gtkhtml.h>
 #include <libgnomevfs/gnome-vfs.h>
+#include <gdk/gdkkeysyms.h>
 
 /* gobject structure methods */
 static void    modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass);
@@ -414,10 +416,30 @@ set_part (ModestGtkhtmlMimePartView *self, TnyMimePart *part)
 		return;
 	}
 
-	if (tny_mime_part_content_type_is (part, "text/html"))
+	if (tny_mime_part_content_type_is (part, "text/html")) {
 		set_html_part (self, part);
-	else
-		set_text_part (self, part);
+	} else {
+		if (tny_mime_part_content_type_is (part, "message/rfc822")) {
+			gchar *header_content_type, *header_content_type_lower;
+			header_content_type = modest_tny_mime_part_get_header_value (part, "Content-Type");
+			if (header_content_type) {
+				header_content_type = g_strstrip (header_content_type);
+				header_content_type_lower = g_ascii_strdown (header_content_type, -1);
+
+				if (!g_ascii_strcasecmp (header_content_type_lower, "text/html"))
+					set_html_part (self, part);
+				else 
+					set_text_part (self, part);
+
+				g_free (header_content_type_lower);
+				g_free (header_content_type);
+			} else {
+				set_text_part (self, part);
+			}
+		} else {
+			set_text_part (self, part);
+		}
+	}
 
 }