[evolution] I#1092 - Mail: Skip error parts when quoting/printing messages

[Milan Crha <mcrha src gnome org>]

commit 46cc214e3d878fc5b85caf122148d30b10b9e79a
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 14 17:29:30 2020 +0200

    I#1092 - Mail: Skip error parts when quoting/printing messages
    
    Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1092

 src/em-format/e-mail-formatter-quote.c | 4 ++++
 src/em-format/e-mail-parser.c          | 1 +
 2 files changed, 5 insertions(+)
---
diff --git a/src/em-format/e-mail-formatter-quote.c b/src/em-format/e-mail-formatter-quote.c
index 69b8fd510a..6d0a3a10a8 100644
--- a/src/em-format/e-mail-formatter-quote.c
+++ b/src/em-format/e-mail-formatter-quote.c
@@ -99,6 +99,10 @@ mail_formatter_quote_run (EMailFormatter *formatter,
 
                mime_type = e_mail_part_get_mime_type (part);
 
+               /* Skip error messages in the quoted part */
+               if (g_strcmp0 (mime_type, "application/vnd.evolution.error") == 0)
+                       continue;
+
                e_mail_formatter_format_as (
                        formatter, context, part, stream,
                        mime_type, cancellable);
diff --git a/src/em-format/e-mail-parser.c b/src/em-format/e-mail-parser.c
index 0af44e6fe8..c0e6a4c8cc 100644
--- a/src/em-format/e-mail-parser.c
+++ b/src/em-format/e-mail-parser.c
@@ -740,6 +740,7 @@ e_mail_parser_error (EMailParser *parser,
 
        mail_part = e_mail_part_new (part, uri);
        e_mail_part_set_mime_type (mail_part, mime_type);
+       e_mail_part_set_is_printable (mail_part, FALSE);
        mail_part->is_error = TRUE;
 
        g_free (uri);