aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-format.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index bdb5541c33..e005e5a55b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-07 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-format.c (try_inline_pgp): Add a "x-inline-pgp-hack=true"
+ paramter to the multipart's content-type.
+
2001-11-05 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-editor.c (construct): Don't make the account editor
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 53f1b4aa83..a0b848a202 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1335,7 +1335,8 @@ try_inline_pgp (char *start, CamelMimePart *mime_part,
multipart = camel_multipart_new ();
camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
"multipart/encrypted; "
- "protocol=\"application/pgp-encrypted\"");
+ "protocol=\"application/pgp-encrypted\"; "
+ "x-inline-pgp-hack=true");
part = fake_mime_part_from_data ("Version: 1\n",
sizeof ("Version: 1\n") - 1,