Merged fix for bug 86199 from trunk

pmo-diablo-r5374

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 9aeb40d..d0c4f63 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -441,7 +441,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
                g_free (header_content_type_lower);
                g_free (header_content_type);
                return NULL;
-       }
+       }       
        g_free (header_content_type_lower);
        g_free (header_content_type);
 
@@ -462,7 +462,9 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
                content_type = g_strstrip (content_type);
                content_type_lower = g_ascii_strdown (content_type, -1);
                g_free (content_type);
-               is_text_part = g_str_has_prefix (content_type_lower, "text/");
+               is_text_part = 
+                       g_str_has_prefix (content_type_lower, "text/") ||
+                       g_str_has_prefix (content_type_lower, "message/rfc822");
                g_free (content_type_lower);
                /* if this part cannot be a supported body return NULL */
                if (!is_text_part) {

diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c
index 28031b9..d541cec 100644 (file)
--- 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>
@@ -435,10 +436,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);
+               }
+       }
 
 }