From 903b5ac6305612d16e6053b4a4e8957d8ada9bde Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Sun, 14 Mar 2021 22:36:02 -0600
Subject:    * The instruction to remove the double quotes from the processing
 of      customized headers existed in pine, but it was removed in alpine, but
      I do not know why, so we will restore it until we understand why it     
 was removed. Also see:     
 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=981781

---
 pith/pine.hlp | 11 +++++++++++
 pith/send.c   | 10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pith/pine.hlp b/pith/pine.hlp
index 6ab8a33a..fc6ed962 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -185,6 +185,17 @@ new additions to Alpine, please check it periodically.
 
 <P> These changes were made after the release of version 2.24.
 
+<P> 
+New features include:
+
+<UL>
+<LI> Experimental: The instruction to remove the double quotes from the processing of
+     customized headers existed in pine, but it was removed in alpine. Restoring
+     old Alpine behavior. See 
+     <A href="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=981781">this</A>
+     report for more background information.
+</UL>
+
 <P>
 Bugs addressed:
 
diff --git a/pith/send.c b/pith/send.c
index 8d4d419a..307d9367 100644
--- a/pith/send.c
+++ b/pith/send.c
@@ -5070,8 +5070,16 @@ customized_hdr_setup(PINEFIELD *head, char **list, CustomType cstmtype)
 		    /* give them an alloc'd default, even if empty */
 		    pf->textbuf = cpystr((*value == ':')
 					   ? skip_white_space(++value) : "");
-		    if(pf->textbuf && pf->textbuf[0])
+		    /* The instruction to remove the double quotes existed in
+		     * pine, but it was removed in alpine, but I do not know
+		     * why, so we will restore it until we understand why it
+		     * was removed. Also see:
+		     * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=981781
+		     */
+		    if(pf->textbuf && pf->textbuf[0]){
+		      removing_double_quotes(pf->textbuf);
 		      pf->val = cpystr(pf->textbuf);
+		    }
 
 		    pf++;
 		}
-- 
cgit v1.2.3-54-g00ecf