aboutsummaryrefslogtreecommitdiffstats
path: root/em-format
diff options
context:
space:
mode:
Diffstat (limited to 'em-format')
-rw-r--r--em-format/e-mail-parser-multipart-mixed.c9
-rw-r--r--em-format/e-mail-parser-multipart-related.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index 1fdfb3cc33..1d14fced68 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -83,10 +83,13 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
ct = camel_mime_part_get_content_type (subpart);
/* Display parts with CID as attachments
- * (unless they already are attachments). */
+ * (unless they already are attachments).
+ * Show also hidden attachments with CID,
+ * because this is multipart/mixed,
+ * not multipart/related. */
if (mail_part != NULL &&
- mail_part->cid != NULL &&
- !mail_part->is_attachment) {
+ mail_part->cid != NULL &&
+ (!mail_part->is_attachment || mail_part->is_hidden)) {
e_mail_parser_wrap_as_attachment (
parser, subpart, part_id, &work_queue);
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index e2ed728215..c90e5bf31d 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -125,7 +125,7 @@ empe_mp_related_parse (EMailParserExtension *extension,
for (link = head; link != NULL; link = g_list_next (link)) {
EMailPart *mail_part = link->data;
- /* Don't render the part on it's own! */
+ /* Don't render the part on its own! */
if (e_mail_part_utils_body_refers (html_body, mail_part->cid))
mail_part->is_hidden = TRUE;
}