aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--em-format/e-mail-formatter.h1
-rw-r--r--mail/e-mail-display.c2
-rw-r--r--mail/e-mail-request.c10
3 files changed, 3 insertions, 10 deletions
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
index d17a3ac6da..c0599eaa96 100644
--- a/em-format/e-mail-formatter.h
+++ b/em-format/e-mail-formatter.h
@@ -51,6 +51,7 @@ typedef enum {
E_MAIL_FORMATTER_MODE_NORMAL = 0,
E_MAIL_FORMATTER_MODE_SOURCE,
E_MAIL_FORMATTER_MODE_RAW,
+ E_MAIL_FORMATTER_MODE_CID,
E_MAIL_FORMATTER_MODE_PRINTING,
E_MAIL_FORMATTER_MODE_ALL_HEADERS
} EMailFormatterMode;
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index f2a3035d0a..a286787be0 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -354,7 +354,7 @@ mail_display_resource_requested (WebKitWebView *web_view,
new_uri = e_mail_part_build_uri (
folder, message_uid,
"part_id", G_TYPE_STRING, uri,
- "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, NULL);
+ "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_CID, NULL);
webkit_network_request_set_uri (request, new_uri);
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index 2c2fb02ce6..a28cdf94da 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -136,15 +136,7 @@ handle_mail_request (GSimpleAsyncResult *res,
}
if (part != NULL) {
- CamelContentType *content_type;
-
- content_type = camel_mime_part_get_content_type (part->part);
-
- if (context.mode == E_MAIL_FORMATTER_MODE_RAW && content_type &&
- camel_content_type_is (content_type, "text", "*") &&
- !camel_content_type_is (content_type, "text", "plain") &&
- !camel_content_type_is (content_type, "text", "html") &&
- !camel_content_type_is (content_type, "text", "calendar")) {
+ if (context.mode == E_MAIL_FORMATTER_MODE_CID) {
CamelDataWrapper *dw;
CamelStream *raw_content;
GByteArray *ba;