Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 mutt (1.14.7-1.0antix1) unstable; urgency=medium
 .
   * upstream bugfix release
Author: anticapitalista <antix@operamail.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2020-08-30

--- mutt-1.14.7.orig/headers.c
+++ mutt-1.14.7/headers.c
@@ -55,7 +55,7 @@ int mutt_edit_headers (const char *edito
     }
 
     mutt_env_to_local (sctx->msg->env);
-    mutt_write_rfc822_header (ofp, sctx->msg->env, NULL, MUTT_WRITE_HEADER_EDITHDRS, 0, 0);
+    mutt_write_rfc822_header (ofp, sctx->msg->env, NULL, MUTT_WRITE_HEADER_EDITHDRS, 0, 0, 1);
     fputc ('\n', ofp);	/* tie off the header. */
 
     /* now copy the body of the message. */
--- mutt-1.14.7.orig/init.h
+++ mutt-1.14.7/init.h
@@ -974,7 +974,7 @@ struct option_t MuttVars[] = {
   ** .pp
   ** This variable specifies which editor is used by mutt.
   ** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
-  ** variable, or to the string ``/usr/bin/editor'' if neither of those are set.
+  ** variable, or to the string ``vi'' if neither of those are set.
   ** .pp
   ** The \fC$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
   ** of the file to be edited.  If the \fI%s\fP escape does not appear in \fC$$editor\fP, a
@@ -4465,6 +4465,9 @@ struct option_t MuttVars[] = {
   ** Note this option only affects the sending of messages.  Fcc'ed
   ** copies of a message will always contain the ``Bcc:'' header if
   ** one exists.
+  ** .pp
+  ** On Debian systems, exim4 and postfix strip BCC headers by
+  ** default. The above warning applies to exim3 users, see /etc/Muttrc.
   */
   { "write_inc",	DT_NUM,	 R_NONE, {.p=&WriteInc}, {.l=10} },
   /*
--- mutt-1.14.7.orig/main.c
+++ mutt-1.14.7/main.c
@@ -1249,7 +1249,7 @@ int main (int argc, char **argv, char **
         mutt_write_rfc822_header (fout, msg->env, msg->content,
                                   MUTT_WRITE_HEADER_POSTPONE, 0,
                                   option (OPTCRYPTPROTHDRSREAD) &&
-                                  mutt_should_hide_protected_subject (msg));
+                                  mutt_should_hide_protected_subject (msg), 1);
         if (option (OPTRESUMEEDITEDDRAFTFILES))
           fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
         fputc ('\n', fout);
--- mutt-1.14.7.orig/pattern.c
+++ mutt-1.14.7/pattern.c
@@ -278,7 +278,7 @@ static int msg_search_sendmode (HEADER *
 
     mutt_write_rfc822_header (fp, h->env, h->content,
                               MUTT_WRITE_HEADER_POSTPONE,
-                              0, 0);
+                              0, 0, 1);
     fflush (fp);
     fseek (fp, 0, 0);
 
--- mutt-1.14.7.orig/protos.h
+++ mutt-1.14.7/protos.h
@@ -401,7 +401,7 @@ int mutt_write_fcc (const char *path, SE
 int mutt_write_mime_body (BODY *, FILE *);
 int mutt_write_mime_header (BODY *, FILE *);
 int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags);
-int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, mutt_write_header_mode, int, int);
+int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, mutt_write_header_mode, int, int, int);
 void mutt_write_references (LIST *, FILE *, int);
 int mutt_yesorno (const char *, int);
 void mutt_set_header_color(CONTEXT *, HEADER *);
--- mutt-1.14.7.orig/send.c
+++ mutt-1.14.7/send.c
@@ -1158,12 +1158,12 @@ static int invoke_mta (HEADER *msg)
 #ifdef MIXMASTER
   mutt_write_rfc822_header (tempfp, msg->env, msg->content,
                             MUTT_WRITE_HEADER_NORMAL, msg->chain ? 1 : 0,
-                            mutt_should_hide_protected_subject (msg));
+                            mutt_should_hide_protected_subject (msg), 0);
 #endif
 #ifndef MIXMASTER
   mutt_write_rfc822_header (tempfp, msg->env, msg->content,
                             MUTT_WRITE_HEADER_NORMAL, 0,
-                            mutt_should_hide_protected_subject (msg));
+                            mutt_should_hide_protected_subject (msg), 0);
 #endif
 #ifdef USE_SMTP
   if (old_write_bcc)
--- mutt-1.14.7.orig/sendlib.c
+++ mutt-1.14.7/sendlib.c
@@ -427,7 +427,7 @@ int mutt_write_mime_header (BODY *a, FIL
         ) &&
       a->mime_headers)
   {
-    mutt_write_rfc822_header (f, a->mime_headers, NULL, MUTT_WRITE_HEADER_MIME, 0, 0);
+    mutt_write_rfc822_header (f, a->mime_headers, NULL, MUTT_WRITE_HEADER_MIME, 0, 0, 1);
   }
 
   /* Do NOT add the terminator here!!! */
@@ -2181,7 +2181,7 @@ out:
  */
 int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
 			      mutt_write_header_mode mode, int privacy,
-                              int hide_protected_subject)
+                              int hide_protected_subject, int should_write_bcc)
 {
   char buffer[LONG_STRING];
   char *p, *q;
@@ -2225,7 +2225,7 @@ int mutt_write_rfc822_header (FILE *fp,
   else if (mode == MUTT_WRITE_HEADER_EDITHDRS)
     fputs ("Cc: \n", fp);
 
-  if (env->bcc)
+  if (env->bcc && should_write_bcc)
   {
     if (mode == MUTT_WRITE_HEADER_POSTPONE ||
         mode == MUTT_WRITE_HEADER_EDITHDRS ||
@@ -3040,7 +3040,7 @@ int mutt_write_fcc (const char *path, SE
                             post ? MUTT_WRITE_HEADER_POSTPONE : MUTT_WRITE_HEADER_FCC,
                             0,
                             option (OPTCRYPTPROTHDRSREAD) &&
-                            mutt_should_hide_protected_subject (hdr));
+                            mutt_should_hide_protected_subject (hdr), 1);
 
   /* (postponment) if this was a reply of some sort, <msgid> contains the
    * Message-ID: of message replied to.  Save it using a special X-Mutt-
