From: Alain Bench <messtic@oreka.com>
Date: Mon, 21 Feb 2005 04:42:34 +0000 (+0000)
Subject: Bcc should be RFC2047-encoded, too.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8519197659aa8f9af6f2a4542595cc2abc9c03e1;p=neomutt

Bcc should be RFC2047-encoded, too.
---

diff --git a/parse.c b/parse.c
index edc9eefe4..16473bd03 100644
--- a/parse.c
+++ b/parse.c
@@ -1405,6 +1405,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs,
     rfc2047_decode_adrlist (e->from);
     rfc2047_decode_adrlist (e->to);
     rfc2047_decode_adrlist (e->cc);
+    rfc2047_decode_adrlist (e->bcc);
     rfc2047_decode_adrlist (e->reply_to);
     rfc2047_decode_adrlist (e->mail_followup_to);
     rfc2047_decode_adrlist (e->return_path);
diff --git a/pgp.c b/pgp.c
index 3b8b9a5be..17c3d17a9 100644
--- a/pgp.c
+++ b/pgp.c
@@ -1486,6 +1486,11 @@ int pgp_send_menu (HEADER *msg, int *redraw)
   
   if (!(WithCrypto & APPLICATION_PGP))
     return msg->security;
+
+  /* If autoinline and no crypto options set, then set inline. */
+  if (option (OPTPGPAUTOINLINE) && 
+      !((msg->security & APPLICATION_PGP) && (msg->security & (SIGN|ENCRYPT))))
+    msg->security |= INLINE;
   
   snprintf (prompt, sizeof (prompt), 
 	    _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "),
diff --git a/sendlib.c b/sendlib.c
index 6d9720830..1185dafcd 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -2170,6 +2170,7 @@ void mutt_prepare_envelope (ENVELOPE *env, int final)
   /* Take care of 8-bit => 7-bit conversion. */
   rfc2047_encode_adrlist (env->to, "To");
   rfc2047_encode_adrlist (env->cc, "Cc");
+  rfc2047_encode_adrlist (env->bcc, "Bcc");
   rfc2047_encode_adrlist (env->from, "From");
   rfc2047_encode_adrlist (env->mail_followup_to, "Mail-Followup-To");
   rfc2047_encode_adrlist (env->reply_to, "Reply-To");
@@ -2193,6 +2194,7 @@ void mutt_unprepare_envelope (ENVELOPE *env)
   /* back conversions */
   rfc2047_decode_adrlist (env->to);
   rfc2047_decode_adrlist (env->cc);
+  rfc2047_decode_adrlist (env->bcc);
   rfc2047_decode_adrlist (env->from);
   rfc2047_decode_adrlist (env->reply_to);
   rfc2047_decode (&env->subject);