diff options
| -rw-r--r-- | em-format/em-format-quote.c | 4 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 6 | ||||
| -rw-r--r-- | mail/em-composer-utils.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index 569c46f9c4..6d6ed6a4ab 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -383,6 +383,10 @@ emfq_format_header (EMFormat *emf, strcpy (name, namein); canon_header_name (name); + /* Never quote Bcc headers */ + if (g_str_equal (name, "Bcc") || g_str_equal (name, "Resent-Bcc")) + return; + for (i = 0; addrspec_hdrs[i]; i++) { if (!strcmp (name, addrspec_hdrs[i])) { addrspec = TRUE; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index ff977bd66e..505d50e850 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1607,6 +1607,12 @@ redirect_get_composer (EShell *shell, while (camel_medium_get_header (CAMEL_MEDIUM (message), "Delivered-To")) camel_medium_remove_header (CAMEL_MEDIUM (message), "Delivered-To"); + while (camel_medium_get_header (CAMEL_MEDIUM (message), "Bcc")) + camel_medium_remove_header (CAMEL_MEDIUM (message), "Bcc"); + + while (camel_medium_get_header (CAMEL_MEDIUM (message), "Resent-Bcc")) + camel_medium_remove_header (CAMEL_MEDIUM (message), "Resent-Bcc"); + account = em_utils_guess_account_with_recipients (message, NULL); composer = e_msg_composer_new_redirect ( diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index 81e8cf1eb0..e1974aa8f3 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -67,10 +67,6 @@ void em_utils_redirect_message (EShell *shell, void em_utils_redirect_message_by_uid (EShell *shell, CamelFolder *folder, const gchar *uid); -void em_utils_forward_message_raw (CamelFolder *folder, - CamelMimeMessage *message, - const gchar *address, - GError **error); void em_utils_handle_receipt (EMailSession *session, CamelFolder *folder, const gchar *uid, |