From 6fc320c2360b122c73371ad5ccb68bb8109c911f Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 8 Apr 2024 17:52:04 +0200
Subject: [PATCH] $crypt_protected_headers_write: Change default to 'yes'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Link: <https://github.com/neomutt/neomutt/issues/4236>
Link: <https://github.com/neomutt/neomutt/issues/4223>
Link: <https://github.com/neomutt/neomutt/issues/4226>
Reviewed-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Cc: Richard Russon <rich@flatcap.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 docs/config.c        | 2 +-
 docs/manual.xml.head | 2 --
 ncrypt/config.c      | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/config.c b/docs/config.c
index 58df57278dc..d872ebc7188 100644
--- a/docs/config.c
+++ b/docs/config.c
@@ -873,7 +873,7 @@
 ** (Crypto only)
 */
 
-{ "crypt_protected_headers_write", DT_BOOL, false },
+{ "crypt_protected_headers_write", DT_BOOL, true },
 /*
 ** .pp
 ** When set, NeoMutt will generate protected headers for signed and encrypted
diff --git a/docs/manual.xml.head b/docs/manual.xml.head
index f94ea9c9412..362d5031edc 100644
--- a/docs/manual.xml.head
+++ b/docs/manual.xml.head
@@ -13505,8 +13505,6 @@ set pgp_default_key = "1111111111111111111111111111111111111111"
 set crypt_autosign = yes
 <emphasis role="comment"># Encrypt mail if all recipients have valid public keys</emphasis>
 set crypt_opportunistic_encrypt = yes
-<emphasis role="comment"># Sign/encrypt protected headers (Subject)</emphasis>
-set crypt_protected_headers_write = yes
 <emphasis role="comment"># Self encrypt mail</emphasis>
 set crypt_self_encrypt = yes
 
diff --git a/ncrypt/config.c b/ncrypt/config.c
index b182b3750a2..915565f4b39 100644
--- a/ncrypt/config.c
+++ b/ncrypt/config.c
@@ -123,7 +123,7 @@ static struct ConfigDef NcryptVars[] = {
   { "crypt_protected_headers_subject", DT_STRING, IP "...", 0, NULL,
     "Use this as the subject for encrypted emails"
   },
-  { "crypt_protected_headers_write", DT_BOOL, false, 0, NULL,
+  { "crypt_protected_headers_write", DT_BOOL, true, 0, NULL,
     "Generate protected header (Memory Hole) for signed and encrypted emails"
   },
   { "crypt_timestamp", DT_BOOL, true, 0, NULL,