* Fixes NB#80734, viewer opened with dimmed toolbar

[modest] / src / modest-formatter.c

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 4e1e367..ed10222 100644 (file)
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -114,7 +114,7 @@ construct_from_text (TnyMimePart *part,
 
        /* Construct MIME part */
        tny_stream_reset (text_body_stream);
-       tny_mime_part_construct_from_stream (part, text_body_stream, content_type);
+       tny_mime_part_construct (part, text_body_stream, content_type, "7bit");
        tny_stream_reset (text_body_stream);
 
        /* Clean */
@@ -189,8 +189,10 @@ modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
        construct_from_text (body_part, "", priv->content_type);
        g_object_unref (body_part);
 
-       /* Add parts */
-       tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
+       if (msg) {
+               /* Add parts */
+               tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
+       }
 
        return new_msg;
 }