diff --git a/UPDATING.txt b/UPDATING.txt
index c0a0c66..7de150e 100644
--- a/UPDATING.txt
+++ b/UPDATING.txt
@@ -2,9 +2,9 @@ Update procedure:
 
 Some features of Alpine do not exist in the release tarball but are only
 provided as patches (but by the same author..). So when there is a new
-release, the OOT patches on the website get updated too.
+release, the out-of-tree patches on the website get updated too.
 
-	version="2.24"
+	version="2.25"
 	for i in WrtAcc colortext fancy fillpara fromheader insertpat maildir rules DelText; do
 	wget -O- "http://alpine.x10host.com/alpine/patches/alpine-$version/$i.patch.gz" | gzip -cd >"chappa-$i.patch";
 	done
diff --git a/alpine-2.24.tar.xz b/alpine-2.24.tar.xz
deleted file mode 100644
index dc32021..0000000
--- a/alpine-2.24.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:651a9ffa0a29e2b646a0a6e0d5a2c8c50f27a07a26a61640b7c783d06d0abcef
-size 7341676
diff --git a/alpine-2.24.tar.xz.sig b/alpine-2.24.tar.xz.sig
deleted file mode 100644
index 7e5b03b..0000000
Binary files a/alpine-2.24.tar.xz.sig and /dev/null differ
diff --git a/alpine-2.25.tar.xz b/alpine-2.25.tar.xz
new file mode 100644
index 0000000..6c1de86
--- /dev/null
+++ b/alpine-2.25.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
+size 7495372
diff --git a/alpine-gcc44.diff b/alpine-gcc44.diff
index 1049b05..82c37db 100644
--- a/alpine-gcc44.diff
+++ b/alpine-gcc44.diff
@@ -1,13 +1,13 @@
 ---
- imap/src/osdep/unix/dummy.c |   14 ++++++++++++--
+ imap/src/osdep/unix/dummy.c |   17 ++++++++++++-----
  pith/send.c                 |    1 +
- 2 files changed, 13 insertions(+), 2 deletions(-)
+ 2 files changed, 13 insertions(+), 5 deletions(-)
 
-Index: alpine-2.20/imap/src/osdep/unix/dummy.c
+Index: alpine-2.25/imap/src/osdep/unix/dummy.c
 ===================================================================
---- alpine-2.20.orig/imap/src/osdep/unix/dummy.c
-+++ alpine-2.20/imap/src/osdep/unix/dummy.c
-@@ -734,6 +734,17 @@ long dummy_copy (MAILSTREAM *stream,char
+--- alpine-2.25.orig/imap/src/osdep/unix/dummy.c
++++ alpine-2.25/imap/src/osdep/unix/dummy.c
+@@ -735,6 +735,17 @@ long dummy_copy (MAILSTREAM *stream,char
    return NIL;
  }
  
@@ -25,21 +25,24 @@ Index: alpine-2.20/imap/src/osdep/unix/dummy.c
  
  /* Dummy append message string
   * Accepts: mail stream
-@@ -753,8 +764,7 @@ long dummy_append (MAILSTREAM *stream,ch
+@@ -754,11 +765,7 @@ long dummy_append (MAILSTREAM *stream,ch
  				/* append to INBOX? */
    if (!compare_cstring (mailbox,"INBOX")) {
  				/* yes, if no empty proto try creating */
--    if (!ts && !(*(ts = default_proto (NIL))->dtb->create) (ts,"INBOX"))
--      ts = NIL;
+-    if (!ts){
+-	ts = default_proto (NIL);
+-	if(!(*ts->dtb->create)(ts,"INBOX"))
+-	   ts = NIL;
+-    }
 +    ts = dummy_rewrite_code(ts);
    }
    else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) {
      if ((e = errno) == ENOENT) /* failed, was it no such file? */
-Index: alpine-2.20/pith/send.c
+Index: alpine-2.25/pith/send.c
 ===================================================================
---- alpine-2.20.orig/pith/send.c
-+++ alpine-2.20/pith/send.c
-@@ -4159,6 +4159,7 @@ set_parameter(PARAMETER **param, char *p
+--- alpine-2.25.orig/pith/send.c
++++ alpine-2.25/pith/send.c
+@@ -4165,6 +4165,7 @@ set_parameter(PARAMETER **param, char *p
  	      pm->value = cpystr(new_value);
  	}
      }
diff --git a/alpine.changes b/alpine.changes
index 36ca3e4..12b1dff 100644
--- a/alpine.changes
+++ b/alpine.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Sep 19 12:26:48 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.25
+  * New configuration variable VAR_ssl-ciphers that allows users
+    to list the ciphers to use when connecting to a SSL
+    server.
+  * New hidden feature FEAT_enable-delete-before-writing to add
+    support for terminals that need lines to be deleted before
+    being written.
+  * Always follow ‘suppress-asterisks-in-password-prompt’ setting
+    in the various password prompts.
+  * Fixed a memory corruption when alpine searches for a string
+    that is an incomplete utf8 string in a local folder.
+  * Fixed: When forwarding a message, replacing an attachment
+    might make Alpine re-attach the original attachment.
+
 -------------------------------------------------------------------
 Tue May 25 11:44:38 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/alpine.spec b/alpine.spec
index f0b9470..8e81d33 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -19,7 +19,7 @@
 Name:           alpine
 # For debugging only:
 %define		build_vanilla		0
-Version:        2.24
+Version:        2.25
 Release:        0
 Summary:        Mail User Agent
 License:        Apache-2.0
@@ -28,7 +28,7 @@ URL:            http://alpine.x10host.com/alpine/
 #Git-Clone:     https://repo.or.cz/alpine.git
 
 Source:         http://alpine.x10host.com/alpine/release/src/alpine-%version.tar.xz
-Source2:        http://alpine.x10host.com/alpine/release/src/sig/alpine-%version.tar.xz.sig
+#Source2:        http://alpine.x10host.com/alpine/release/src/sig/alpine-%version.tar.xz.sig
 Source3:        %name.png
 Source4:        %name.desktop
 Source9:        UPDATING.txt
diff --git a/chappa-DelText.patch b/chappa-DelText.patch
index a0464fa..96380d5 100644
--- a/chappa-DelText.patch
+++ b/chappa-DelText.patch
@@ -4,10 +4,10 @@
  pico/search.c |    8 ++++++--
  3 files changed, 57 insertions(+), 2 deletions(-)
 
-Index: alpine-2.24/pico/basic.c
+Index: alpine-2.25/pico/basic.c
 ===================================================================
---- alpine-2.24.orig/pico/basic.c
-+++ alpine-2.24/pico/basic.c
+--- alpine-2.25.orig/pico/basic.c
++++ alpine-2.25/pico/basic.c
 @@ -959,7 +959,57 @@ scrolldownline(int f, int n)
      return (scrollforw (1, FALSE));
  }
@@ -66,10 +66,10 @@ Index: alpine-2.24/pico/basic.c
  
  /*
   * Scroll to a position.
-Index: alpine-2.24/pico/efunc.h
+Index: alpine-2.25/pico/efunc.h
 ===================================================================
---- alpine-2.24.orig/pico/efunc.h
-+++ alpine-2.24/pico/efunc.h
+--- alpine-2.25.orig/pico/efunc.h
++++ alpine-2.25/pico/efunc.h
 @@ -59,6 +59,7 @@ extern  unsigned char accent(UCS, UCS);
  extern  unsigned char GetAccent(void);
  extern	int forwpage(int, int);
@@ -78,10 +78,10 @@ Index: alpine-2.24/pico/efunc.h
  extern  int scrollupline(int, int);
  extern  int scrolldownline(int, int);
  extern  int scrollto(int, int);
-Index: alpine-2.24/pico/search.c
+Index: alpine-2.25/pico/search.c
 ===================================================================
---- alpine-2.24.orig/pico/search.c
-+++ alpine-2.24/pico/search.c
+--- alpine-2.25.orig/pico/search.c
++++ alpine-2.25/pico/search.c
 @@ -73,7 +73,7 @@ EXTRAKEYS    menu_srchpat[] = {
  	{"^O", N_("End of Para"),   (CTRL|'O')},
  	{"^U", N_("FullJustify"),   (CTRL|'U')},
diff --git a/chappa-WrtAcc.patch b/chappa-WrtAcc.patch
index 196d404..55cdc46 100644
--- a/chappa-WrtAcc.patch
+++ b/chappa-WrtAcc.patch
@@ -1,6 +1,6 @@
-diff -rc alpine-2.24/pico/basic.c alpine-2.24.WrtAcc/pico/basic.c
-*** alpine-2.24/pico/basic.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.WrtAcc/pico/basic.c	2020-10-10 00:26:57.220352202 -0600
+diff -rc alpine-2.25/pico/basic.c alpine-2.25.WrtAcc/pico/basic.c
+*** alpine-2.25/pico/basic.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.WrtAcc/pico/basic.c	2021-09-18 09:03:15.983056911 -0600
 ***************
 *** 342,347 ****
 --- 342,530 ----
@@ -193,9 +193,9 @@ diff -rc alpine-2.24/pico/basic.c alpine-2.24.WrtAcc/pico/basic.c
   
   /* 
    * go forword to the end of the current paragraph
-diff -rc alpine-2.24/pico/composer.c alpine-2.24.WrtAcc/pico/composer.c
-*** alpine-2.24/pico/composer.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.WrtAcc/pico/composer.c	2020-10-10 00:26:57.220352202 -0600
+diff -rc alpine-2.25/pico/composer.c alpine-2.25.WrtAcc/pico/composer.c
+*** alpine-2.25/pico/composer.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.WrtAcc/pico/composer.c	2021-09-18 09:03:15.983056911 -0600
 ***************
 *** 2015,2021 ****
   	tbufp = &strng[ods.p_len];
@@ -229,12 +229,12 @@ diff -rc alpine-2.24/pico/composer.c alpine-2.24.WrtAcc/pico/composer.c
                 case (CTRL|KEY_LEFT):     /* word skip left */
                   if(ods.p_ind > 0)       /* Scoot one char left if possible */
                     ods.p_ind--;
-diff -rc alpine-2.24/pico/display.c alpine-2.24.WrtAcc/pico/display.c
-*** alpine-2.24/pico/display.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.WrtAcc/pico/display.c	2020-10-10 00:26:57.220352202 -0600
+diff -rc alpine-2.25/pico/display.c alpine-2.25.WrtAcc/pico/display.c
+*** alpine-2.25/pico/display.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.WrtAcc/pico/display.c	2021-09-18 09:03:16.279058955 -0600
 ***************
-*** 2196,2201 ****
---- 2196,2206 ----
+*** 2191,2196 ****
+--- 2191,2201 ----
   	    b = &buf[ucs4_strlen(buf)];
   	    continue;
   
@@ -247,7 +247,7 @@ diff -rc alpine-2.24/pico/display.c alpine-2.24.WrtAcc/pico/display.c
   	  case KEY_RIGHT :
   	    if(*b == '\0')
 ***************
-*** 2314,2320 ****
+*** 2309,2315 ****
   #endif
   
   	  default : 
@@ -255,7 +255,7 @@ diff -rc alpine-2.24/pico/display.c alpine-2.24.WrtAcc/pico/display.c
   	    /* look for match in extra_v */
   	    for(i = 0; i < 12; i++)
   	      if(c && c == extra_v[i]){
---- 2319,2325 ----
+--- 2314,2320 ----
   #endif
   
   	  default : 
@@ -263,9 +263,9 @@ diff -rc alpine-2.24/pico/display.c alpine-2.24.WrtAcc/pico/display.c
   	    /* look for match in extra_v */
   	    for(i = 0; i < 12; i++)
   	      if(c && c == extra_v[i]){
-diff -rc alpine-2.24/pico/ebind.h alpine-2.24.WrtAcc/pico/ebind.h
-*** alpine-2.24/pico/ebind.h	2020-10-10 00:24:28.184554092 -0600
---- alpine-2.24.WrtAcc/pico/ebind.h	2020-10-10 00:26:57.228352405 -0600
+diff -rc alpine-2.25/pico/ebind.h alpine-2.25.WrtAcc/pico/ebind.h
+*** alpine-2.25/pico/ebind.h	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.WrtAcc/pico/ebind.h	2021-09-18 09:03:16.339059369 -0600
 ***************
 *** 61,67 ****
   #ifdef	MOUSE
@@ -319,9 +319,9 @@ diff -rc alpine-2.24/pico/ebind.h alpine-2.24.WrtAcc/pico/ebind.h
   #endif
   #endif
   	{CTRL|'A',		gotobol},
-diff -rc alpine-2.24/pico/efunc.h alpine-2.24.WrtAcc/pico/efunc.h
-*** alpine-2.24/pico/efunc.h	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.WrtAcc/pico/efunc.h	2020-10-10 00:26:57.240352712 -0600
+diff -rc alpine-2.25/pico/efunc.h alpine-2.25.WrtAcc/pico/efunc.h
+*** alpine-2.25/pico/efunc.h	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.WrtAcc/pico/efunc.h	2021-09-18 09:03:16.383059672 -0600
 ***************
 *** 54,59 ****
 --- 54,62 ----
@@ -334,9 +334,9 @@ diff -rc alpine-2.24/pico/efunc.h alpine-2.24.WrtAcc/pico/efunc.h
   extern	int forwpage(int, int);
   extern	int backpage(int, int);
   extern  int scrollupline(int, int);
-diff -rc alpine-2.24/pico/main.c alpine-2.24.WrtAcc/pico/main.c
-*** alpine-2.24/pico/main.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.WrtAcc/pico/main.c	2020-10-10 00:26:57.280353731 -0600
+diff -rc alpine-2.25/pico/main.c alpine-2.25.WrtAcc/pico/main.c
+*** alpine-2.25/pico/main.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.WrtAcc/pico/main.c	2021-09-18 09:03:16.423059949 -0600
 ***************
 *** 458,463 ****
 --- 458,469 ----
diff --git a/chappa-colortext.patch b/chappa-colortext.patch
index b776b25..e152761 100644
--- a/chappa-colortext.patch
+++ b/chappa-colortext.patch
@@ -1,6 +1,6 @@
-diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.colortext/alpine/confscroll.c
-*** alpine-2.24/alpine/confscroll.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.colortext/alpine/confscroll.c	2020-10-10 00:27:00.384432838 -0600
+diff -rc alpine-2.25/alpine/confscroll.c alpine-2.25.colortext/alpine/confscroll.c
+*** alpine-2.25/alpine/confscroll.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.colortext/alpine/confscroll.c	2021-09-18 09:03:19.255079499 -0600
 ***************
 *** 5248,5253 ****
 --- 5248,5256 ----
@@ -13,9 +13,9 @@ diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.colortext/alpine/confscroll
       else if(var == &ps->vars[V_INIT_CMD_LIST]){
   	if(!revert)
   	  q_status_message(SM_ASYNC, 0, 3,
-diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
-*** alpine-2.24/pith/conf.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/conf.c	2020-10-10 00:27:00.388432939 -0600
+diff -rc alpine-2.25/pith/conf.c alpine-2.25.colortext/pith/conf.c
+*** alpine-2.25/pith/conf.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/conf.c	2021-09-18 09:03:19.267079582 -0600
 ***************
 *** 233,238 ****
 --- 233,240 ----
@@ -28,8 +28,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
   
   CONF_TXT_T cf_text_quotereplstr[] =    	"Specifies the string to replace quotes with when viewing a message.";
 ***************
-*** 587,592 ****
---- 589,596 ----
+*** 589,594 ****
+--- 591,598 ----
   #endif /* _WINDOWS */
   {"composer-wrap-column",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
   	NULL,			cf_text_fillcol},
@@ -39,8 +39,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
   	NULL,			cf_text_replystr},
   {"reply-leadin",			0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
 ***************
-*** 862,867 ****
---- 866,873 ----
+*** 866,871 ****
+--- 870,877 ----
   {"incoming-unseen-background-color",	0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
   {"signature-foreground-color",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
   {"signature-background-color",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
@@ -50,8 +50,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
   {"prompt-background-color",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
   {"header-general-foreground-color",	0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0},
 ***************
-*** 2111,2116 ****
---- 2117,2124 ----
+*** 2115,2120 ****
+--- 2121,2128 ----
       set_current_val(&vars[V_DICTIONARY], TRUE, TRUE);
   #endif /* _WINDOWS */
       set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE);
@@ -61,8 +61,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
       set_current_val(&vars[V_HISTORY], TRUE, TRUE);
       set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE);
 ***************
-*** 6677,6682 ****
---- 6685,6691 ----
+*** 6684,6689 ****
+--- 6692,6698 ----
       set_color_val(&vars[V_IND_OP_FORE_COLOR], 0);
       set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0);
       set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0);
@@ -71,8 +71,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
       set_current_val(&ps->vars[V_INDEX_TOKEN_COLORS], TRUE, TRUE);
       set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE);
 ***************
-*** 7926,7931 ****
---- 7935,7942 ----
+*** 7933,7938 ****
+--- 7942,7949 ----
   	return(h_config_scroll_margin);
         case V_DEADLETS :
   	return(h_config_deadlets);
@@ -82,8 +82,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
   	return(h_config_composer_wrap_column);
         case V_TCPOPENTIMEO :
 ***************
-*** 8107,8112 ****
---- 8118,8126 ----
+*** 8116,8121 ****
+--- 8127,8135 ----
         case V_SIGNATURE_FORE_COLOR :
         case V_SIGNATURE_BACK_COLOR :
   	return(h_config_signature_color);
@@ -93,12 +93,12 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.colortext/pith/conf.c
         case V_PROMPT_FORE_COLOR :
         case V_PROMPT_BACK_COLOR :
   	return(h_config_prompt_color);
-diff -rc alpine-2.24/pith/conf.h alpine-2.24.colortext/pith/conf.h
-*** alpine-2.24/pith/conf.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/conf.h	2020-10-10 00:27:00.388432939 -0600
+diff -rc alpine-2.25/pith/conf.h alpine-2.25.colortext/pith/conf.h
+*** alpine-2.25/pith/conf.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/conf.h	2021-09-18 09:03:19.283079692 -0600
 ***************
-*** 175,180 ****
---- 175,182 ----
+*** 176,181 ****
+--- 176,183 ----
   #define VAR_DICTIONARY		     vars[V_DICTIONARY].current_val.l
   #define GLO_DICTIONARY		     vars[V_DICTIONARY].global_val.l
   #endif /* _WINDOWS */
@@ -108,8 +108,8 @@ diff -rc alpine-2.24/pith/conf.h alpine-2.24.colortext/pith/conf.h
   #define GLO_FILLCOL		     vars[V_FILLCOL].global_val.p
   #define VAR_DEADLETS		     vars[V_DEADLETS].current_val.p
 ***************
-*** 474,479 ****
---- 476,483 ----
+*** 475,480 ****
+--- 477,484 ----
   #define GLO_SIGNATURE_FORE_COLOR     vars[V_SIGNATURE_FORE_COLOR].global_val.p
   #define VAR_SIGNATURE_BACK_COLOR     vars[V_SIGNATURE_BACK_COLOR].current_val.p
   #define GLO_SIGNATURE_BACK_COLOR     vars[V_SIGNATURE_BACK_COLOR].global_val.p
@@ -118,9 +118,9 @@ diff -rc alpine-2.24/pith/conf.h alpine-2.24.colortext/pith/conf.h
   #define VAR_PROMPT_FORE_COLOR	     vars[V_PROMPT_FORE_COLOR].current_val.p
   #define VAR_PROMPT_BACK_COLOR	     vars[V_PROMPT_BACK_COLOR].current_val.p
   #define VAR_VIEW_HDR_COLORS	     vars[V_VIEW_HDR_COLORS].current_val.l
-diff -rc alpine-2.24/pith/conftype.h alpine-2.24.colortext/pith/conftype.h
-*** alpine-2.24/pith/conftype.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/conftype.h	2020-10-10 00:27:00.388432939 -0600
+diff -rc alpine-2.25/pith/conftype.h alpine-2.25.colortext/pith/conftype.h
+*** alpine-2.25/pith/conftype.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/conftype.h	2021-09-18 09:03:19.315079913 -0600
 ***************
 *** 83,88 ****
 --- 83,89 ----
@@ -132,8 +132,8 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.colortext/pith/conftype.h
   		, V_REPLY_INTRO
   		, V_QUOTE_REPLACE_STRING
 ***************
-*** 243,248 ****
---- 244,251 ----
+*** 244,249 ****
+--- 245,252 ----
   		, V_INCUNSEEN_BACK_COLOR
   		, V_SIGNATURE_FORE_COLOR
   		, V_SIGNATURE_BACK_COLOR
@@ -142,12 +142,12 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.colortext/pith/conftype.h
   		, V_PROMPT_FORE_COLOR
   		, V_PROMPT_BACK_COLOR
   		, V_HEADER_GENERAL_FORE_COLOR
-diff -rc alpine-2.24/pith/mailview.c alpine-2.24.colortext/pith/mailview.c
-*** alpine-2.24/pith/mailview.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/mailview.c	2020-10-10 00:27:00.388432939 -0600
+diff -rc alpine-2.25/pith/mailview.c alpine-2.25.colortext/pith/mailview.c
+*** alpine-2.25/pith/mailview.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/mailview.c	2021-09-18 09:03:19.367080271 -0600
 ***************
-*** 638,643 ****
---- 638,651 ----
+*** 636,641 ****
+--- 636,649 ----
   	    if((flgs & FM_DISPLAY)
   	       && !(flgs & FM_NOCOLOR)
   	       && pico_usingcolor()
@@ -163,8 +163,8 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.colortext/pith/mailview.c
   	       && ps_global->VAR_SIGNATURE_BACK_COLOR){
   		gf_link_filter(gf_line_test, gf_line_test_opt(color_signature, &is_in_sig));
 ***************
-*** 2870,2875 ****
---- 2878,3067 ----
+*** 2868,2873 ****
+--- 2876,3065 ----
       return(color_pair);
   }
   
@@ -355,9 +355,9 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.colortext/pith/mailview.c
   
   /*
    * The argument fieldname is something like "Subject:..." or "Subject".
-diff -rc alpine-2.24/pith/mailview.h alpine-2.24.colortext/pith/mailview.h
-*** alpine-2.24/pith/mailview.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/mailview.h	2020-10-10 00:27:00.388432939 -0600
+diff -rc alpine-2.25/pith/mailview.h alpine-2.25.colortext/pith/mailview.h
+*** alpine-2.25/pith/mailview.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/mailview.h	2021-09-18 09:03:19.379080355 -0600
 ***************
 *** 30,35 ****
 --- 30,41 ----
@@ -391,12 +391,12 @@ diff -rc alpine-2.24/pith/mailview.h alpine-2.24.colortext/pith/mailview.h
   
   /*
    * BUG:  BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine
-diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp
-*** alpine-2.24/pith/pine.hlp	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/pine.hlp	2020-10-10 00:27:00.408433449 -0600
+diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.colortext/pith/pine.hlp
+*** alpine-2.25/pith/pine.hlp	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/pine.hlp	2021-09-18 09:03:19.399080492 -0600
 ***************
-*** 4975,4980 ****
---- 4975,4981 ----
+*** 5134,5139 ****
+--- 5134,5140 ----
   <li><a href="h_config_print_cat">OPTION: <!--#echo var="VAR_personal-print-category"--></a>
   <li><a href="h_config_print_command">OPTION: <!--#echo var="VAR_personal-print-command"--></a>
   <li><a href="h_config_post_char_set">OPTION: <!--#echo var="VAR_posting-character-set"--></a>
@@ -405,8 +405,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp
   <li><a href="h_config_print_font_char_set">OPTION: Print-Font-Char-Set</a>
   <li><a href="h_config_print_font_name">OPTION: Print-Font-Name</a>
 ***************
-*** 5003,5008 ****
---- 5004,5010 ----
+*** 5162,5167 ****
+--- 5163,5169 ----
   <li><a href="h_config_sending_filter">OPTION: <!--#echo var="VAR_sending-filters"--></a>
   <li><a href="h_config_sendmail_path">OPTION: <!--#echo var="VAR_sendmail-path"--></a>
   <li><a href="h_config_signature_color">OPTION: Signature Color</a>
@@ -415,8 +415,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp
   <li><a href="h_config_smtp_server">OPTION: <!--#echo var="VAR_smtp-server"--></a>
   <li><a href="h_config_sort_key">OPTION: <!--#echo var="VAR_sort-key"--></a>
 ***************
-*** 24817,24822 ****
---- 24819,24861 ----
+*** 25004,25009 ****
+--- 25006,25048 ----
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
@@ -461,8 +461,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp
   <HTML>
   <HEAD>
 ***************
-*** 33438,33443 ****
---- 33477,33506 ----
+*** 33616,33621 ****
+--- 33655,33684 ----
   
   <P>
   <A HREF="h_color_setup">Descriptions of the available commands</A>
@@ -493,9 +493,9 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.colortext/pith/pine.hlp
   <P>
   Look <A HREF="h_edit_nav_cmds">here</A>
   to see the available Editing and Navigation commands.
-diff -rc alpine-2.24/pith/state.c alpine-2.24.colortext/pith/state.c
-*** alpine-2.24/pith/state.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/state.c	2020-10-10 00:27:00.408433449 -0600
+diff -rc alpine-2.25/pith/state.c alpine-2.25.colortext/pith/state.c
+*** alpine-2.25/pith/state.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/state.c	2021-09-18 09:03:19.403080521 -0600
 ***************
 *** 144,149 ****
 --- 144,152 ----
@@ -508,12 +508,12 @@ diff -rc alpine-2.24/pith/state.c alpine-2.24.colortext/pith/state.c
       if((*pps)->ui.homedir)
         fs_give((void **)&(*pps)->ui.homedir);
   
-diff -rc alpine-2.24/pith/state.h alpine-2.24.colortext/pith/state.h
-*** alpine-2.24/pith/state.h	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.colortext/pith/state.h	2020-10-10 00:27:00.420433755 -0600
+diff -rc alpine-2.25/pith/state.h alpine-2.25.colortext/pith/state.h
+*** alpine-2.25/pith/state.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/state.h	2021-09-18 09:03:19.407080548 -0600
 ***************
-*** 348,353 ****
---- 348,355 ----
+*** 349,354 ****
+--- 349,356 ----
       char        *display_charmap;	/* needs to be freed */
       char        *keyboard_charmap;	/* needs to be freed */
       void        *input_cs;
@@ -522,9 +522,9 @@ diff -rc alpine-2.24/pith/state.h alpine-2.24.colortext/pith/state.h
   
       char        *posting_charmap;	/* needs to be freed */
   
-diff -rc alpine-2.24/pith/text.c alpine-2.24.colortext/pith/text.c
-*** alpine-2.24/pith/text.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.colortext/pith/text.c	2020-10-10 00:27:00.420433755 -0600
+diff -rc alpine-2.25/pith/text.c alpine-2.25.colortext/pith/text.c
+*** alpine-2.25/pith/text.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.colortext/pith/text.c	2021-09-18 09:03:19.415080603 -0600
 ***************
 *** 171,176 ****
 --- 171,185 ----
diff --git a/chappa-fancy.patch b/chappa-fancy.patch
index 0a018bd..5e6abe4 100644
--- a/chappa-fancy.patch
+++ b/chappa-fancy.patch
@@ -1,6 +1,6 @@
-diff -rc alpine-2.24/alpine/arg.c alpine-2.24.fancy/alpine/arg.c
-*** alpine-2.24/alpine/arg.c	2020-10-10 00:24:28.212554806 -0600
---- alpine-2.24.fancy/alpine/arg.c	2020-10-10 00:26:49.208148014 -0600
+diff -rc alpine-2.25/alpine/arg.c alpine-2.25.fancy/alpine/arg.c
+*** alpine-2.25/alpine/arg.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/arg.c	2021-09-18 09:03:09.487012066 -0600
 ***************
 *** 70,75 ****
 --- 70,76 ----
@@ -12,8 +12,8 @@ diff -rc alpine-2.24/alpine/arg.c alpine-2.24.fancy/alpine/arg.c
   static char args_err_missing_flag_num[] =	N_("Non numeric argument for flag \"%c\"");
   static char args_err_missing_debug_num[] =	N_("Non numeric argument for \"%s\"");
 ***************
-*** 118,123 ****
---- 119,125 ----
+*** 119,124 ****
+--- 120,126 ----
   N_(" -z \t\tSuspend - allow use of ^Z suspension"),
   N_(" -r \t\tRestricted - can only send mail to oneself"),
   N_(" -sort <sort>\tSort - Specify sort order of folder:"),
@@ -22,8 +22,8 @@ diff -rc alpine-2.24/alpine/arg.c alpine-2.24.fancy/alpine/arg.c
   N_("\t\t\tfrom, size, score, to, cc, /reverse"),
   N_(" -i\t\tIndex - Go directly to index, bypassing main menu"),
 ***************
-*** 280,285 ****
---- 282,288 ----
+*** 285,290 ****
+--- 287,293 ----
       char *cmd_list            = NULL;
       char *debug_str           = NULL;
       char *sort                = NULL;
@@ -32,8 +32,8 @@ diff -rc alpine-2.24/alpine/arg.c alpine-2.24.fancy/alpine/arg.c
       char *lc		      = NULL;
       XOAUTH2_INFO_S x;
 ***************
-*** 503,508 ****
---- 506,522 ----
+*** 508,513 ****
+--- 511,527 ----
   
   		  goto Loop;
   	      }
@@ -51,9 +51,9 @@ diff -rc alpine-2.24/alpine/arg.c alpine-2.24.fancy/alpine/arg.c
   	      else if(strcmp(*av, "url") == 0){
   		  if(args->action == aaFolder && !args->data.folder){
   		      args->action = aaURL;
-diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.fancy/alpine/confscroll.c
-*** alpine-2.24/alpine/confscroll.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.fancy/alpine/confscroll.c	2020-10-10 00:26:49.212148118 -0600
+diff -rc alpine-2.25/alpine/confscroll.c alpine-2.25.fancy/alpine/confscroll.c
+*** alpine-2.25/alpine/confscroll.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/confscroll.c	2021-09-18 09:03:09.487012066 -0600
 ***************
 *** 140,146 ****
   char    *radio_pretty_value(struct pine *, CONF_S *);
@@ -295,9 +295,9 @@ diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.fancy/alpine/confscroll.c
       else if(var == &ps->vars[V_THREAD_MORE_CHAR] ||
               var == &ps->vars[V_THREAD_EXP_CHAR] ||
               var == &ps->vars[V_THREAD_LASTREPLY_CHAR]){
-diff -rc alpine-2.24/alpine/confscroll.h alpine-2.24.fancy/alpine/confscroll.h
-*** alpine-2.24/alpine/confscroll.h	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fancy/alpine/confscroll.h	2020-10-10 00:26:49.212148118 -0600
+diff -rc alpine-2.25/alpine/confscroll.h alpine-2.25.fancy/alpine/confscroll.h
+*** alpine-2.25/alpine/confscroll.h	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/confscroll.h	2021-09-18 09:03:09.487012066 -0600
 ***************
 *** 97,103 ****
   int	 radiobutton_tool(struct pine *, int, CONF_S **, unsigned);
@@ -315,9 +315,9 @@ diff -rc alpine-2.24/alpine/confscroll.h alpine-2.24.fancy/alpine/confscroll.h
   int	 exclude_config_var(struct pine *, struct variable *, int);
   int      config_exit_cmd(unsigned);
   int	 simple_exit_cmd(unsigned);
-diff -rc alpine-2.24/alpine/keymenu.c alpine-2.24.fancy/alpine/keymenu.c
-*** alpine-2.24/alpine/keymenu.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.fancy/alpine/keymenu.c	2020-10-10 00:26:49.212148118 -0600
+diff -rc alpine-2.25/alpine/keymenu.c alpine-2.25.fancy/alpine/keymenu.c
+*** alpine-2.25/alpine/keymenu.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/keymenu.c	2021-09-18 09:03:09.487012066 -0600
 ***************
 *** 679,688 ****
   	RCOMPOSE_MENU,
@@ -420,9 +420,9 @@ diff -rc alpine-2.24/alpine/keymenu.c alpine-2.24.fancy/alpine/keymenu.c
   INST_KEY_MENU(view_keymenu, view_keys);
   
   
-diff -rc alpine-2.24/alpine/keymenu.h alpine-2.24.fancy/alpine/keymenu.h
-*** alpine-2.24/alpine/keymenu.h	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.fancy/alpine/keymenu.h	2020-10-10 00:26:49.212148118 -0600
+diff -rc alpine-2.25/alpine/keymenu.h alpine-2.25.fancy/alpine/keymenu.h
+*** alpine-2.25/alpine/keymenu.h	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/keymenu.h	2021-09-18 09:03:09.523012315 -0600
 ***************
 *** 220,225 ****
 --- 220,238 ----
@@ -445,9 +445,9 @@ diff -rc alpine-2.24/alpine/keymenu.h alpine-2.24.fancy/alpine/keymenu.h
   
   /* Commands for S/MIME screens */
   #define MC_TRUST	900
-diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
-*** alpine-2.24/alpine/mailcmd.c	2020-10-10 00:24:28.212554806 -0600
---- alpine-2.24.fancy/alpine/mailcmd.c	2020-10-10 00:26:49.224148423 -0600
+diff -rc alpine-2.25/alpine/mailcmd.c alpine-2.25.fancy/alpine/mailcmd.c
+*** alpine-2.25/alpine/mailcmd.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/mailcmd.c	2021-09-18 09:03:09.523012315 -0600
 ***************
 *** 114,120 ****
   char     *choose_a_rule(int);
@@ -466,7 +466,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   
   /*
 ***************
-*** 1435,1441 ****
+*** 1438,1444 ****
   	if(any_messages(msgmap, NULL, NULL)){
   	    if(any_lflagged(msgmap, MN_SLCT) > 0L){
   		if(apply_command(state, stream, msgmap, 0,
@@ -474,7 +474,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   		    if(F_ON(F_AUTO_UNSELECT, state)){
   			agg_select_all(stream, msgmap, NULL, 0);
   			unzoom_index(state, stream, msgmap);
---- 1435,1441 ----
+--- 1438,1444 ----
   	if(any_messages(msgmap, NULL, NULL)){
   	    if(any_lflagged(msgmap, MN_SLCT) > 0L){
   		if(apply_command(state, stream, msgmap, 0,
@@ -483,7 +483,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   			agg_select_all(stream, msgmap, NULL, 0);
   			unzoom_index(state, stream, msgmap);
 ***************
-*** 1453,1475 ****
+*** 1456,1478 ****
   
             /*-------- Sort command -------*/
         case MC_SORT :
@@ -507,7 +507,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   	    }
   
   	    state->mangled_footer = 1;
---- 1453,1487 ----
+--- 1456,1490 ----
   
             /*-------- Sort command -------*/
         case MC_SORT :
@@ -544,8 +544,8 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   
   	    state->mangled_footer = 1;
 ***************
-*** 3314,3319 ****
---- 3326,3335 ----
+*** 3315,3320 ****
+--- 3327,3336 ----
   		if(SORT_IS_THREADED(msgmap))
   		  refresh_sort(stream, msgmap, SRT_NON);
   
@@ -557,8 +557,8 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   		state->mangled_header = 1;
   		q_status_message2(SM_ORDER, 0, 4,
 ***************
-*** 3415,3420 ****
---- 3431,3439 ----
+*** 3416,3421 ****
+--- 3432,3440 ----
   	 */
   	if(SORT_IS_THREADED(msgmap))
   	  refresh_sort(stream, msgmap, SRT_NON);
@@ -569,7 +569,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       else{
   	if(del_count){
 ***************
-*** 7324,7330 ****
+*** 7334,7340 ****
   	 * Maybe it makes sense to zoom after a select but not after a colon
   	 * command even though they are very similar.
   	 */
@@ -577,7 +577,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       }
       else{
   	if((all_selected =
---- 7343,7349 ----
+--- 7353,7359 ----
   	 * Maybe it makes sense to zoom after a select but not after a colon
   	 * command even though they are very similar.
   	 */
@@ -586,7 +586,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       else{
   	if((all_selected =
 ***************
-*** 7380,7386 ****
+*** 7390,7396 ****
     ----*/
   int
   apply_command(struct pine *state, MAILSTREAM *stream, MSGNO_S *msgmap,
@@ -594,7 +594,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   {
       int i = 8,			/* number of static entries in sel_opts3 */
           rv = 0,
---- 7399,7405 ----
+--- 7409,7415 ----
     ----*/
   int
   apply_command(struct pine *state, MAILSTREAM *stream, MSGNO_S *msgmap,
@@ -603,7 +603,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       int i = 8,			/* number of static entries in sel_opts3 */
           rv = 0,
 ***************
-*** 7547,7555 ****
+*** 7557,7565 ****
   	collapse_or_expand(state, stream, msgmap,
   			   F_ON(F_SLASH_COLL_ENTIRE, ps_global)
   			     ? 0L
@@ -613,7 +613,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
         case ':' :
   	select_thread_stmp(state, stream, msgmap);
   	break;
---- 7566,7584 ----
+--- 7576,7594 ----
   	collapse_or_expand(state, stream, msgmap,
   			   F_ON(F_SLASH_COLL_ENTIRE, ps_global)
   			     ? 0L
@@ -634,7 +634,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   	select_thread_stmp(state, stream, msgmap);
   	break;
 ***************
-*** 9595,9604 ****
+*** 9605,9614 ****
         Returns 0 if it was cancelled, 1 otherwise.
     ----*/
   int
@@ -645,7 +645,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       int       deefault = 'a', retval = 1;
       HelpType  help;
       ESCKEY_S  sorts[14];
---- 9624,9633 ----
+--- 9634,9643 ----
         Returns 0 if it was cancelled, 1 otherwise.
     ----*/
   int
@@ -657,7 +657,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       HelpType  help;
       ESCKEY_S  sorts[14];
 ***************
-*** 9631,9647 ****
+*** 9641,9657 ****
         strncpy(prompt, _("Choose type of sort, or 'R' to reverse current sort : "),
   	      sizeof(prompt));
   
@@ -675,7 +675,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
       }
   
       sorts[i].ch     = 'r';
---- 9660,9685 ----
+--- 9670,9695 ----
         strncpy(prompt, _("Choose type of sort, or 'R' to reverse current sort : "),
   	      sizeof(prompt));
   
@@ -703,7 +703,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   
       sorts[i].ch     = 'r';
 ***************
-*** 9665,9672 ****
+*** 9675,9682 ****
   	state->mangled_body = 1;		/* signal screen's changed */
   	if(s == 'r')
   	  *rev = !mn_get_revsort(state->msgmap);
@@ -712,7 +712,7 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   
   	if(F_ON(F_SHOW_SORT, ps_global))
   	  ps_global->mangled_header = 1;
---- 9703,9719 ----
+--- 9713,9729 ----
   	state->mangled_body = 1;		/* signal screen's changed */
   	if(s == 'r')
   	  *rev = !mn_get_revsort(state->msgmap);
@@ -731,8 +731,8 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
   	if(F_ON(F_SHOW_SORT, ps_global))
   	  ps_global->mangled_header = 1;
 ***************
-*** 10050,10052 ****
---- 10097,10474 ----
+*** 10060,10062 ****
+--- 10107,10484 ----
   }
   
   #endif	/* _WINDOWS */
@@ -1111,9 +1111,9 @@ diff -rc alpine-2.24/alpine/mailcmd.c alpine-2.24.fancy/alpine/mailcmd.c
 +        expand_thread(state, stream, msgmap, 0);
 + }
 + 
-diff -rc alpine-2.24/alpine/mailcmd.h alpine-2.24.fancy/alpine/mailcmd.h
-*** alpine-2.24/alpine/mailcmd.h	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fancy/alpine/mailcmd.h	2020-10-10 00:26:49.240148831 -0600
+diff -rc alpine-2.25/alpine/mailcmd.h alpine-2.25.fancy/alpine/mailcmd.h
+*** alpine-2.25/alpine/mailcmd.h	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/mailcmd.h	2021-09-18 09:03:09.523012315 -0600
 ***************
 *** 90,96 ****
   int	    ask_mailbox_reopen(struct pine *, int *);
@@ -1155,9 +1155,9 @@ diff -rc alpine-2.24/alpine/mailcmd.h alpine-2.24.fancy/alpine/mailcmd.h
 ! int           expand_this_thread(struct pine *, MAILSTREAM *, MSGNO_S *, int, int);
   
   #endif /* PINE_MAILCMD_INCLUDED */
-diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
-*** alpine-2.24/alpine/mailindx.c	2020-10-10 00:24:28.212554806 -0600
---- alpine-2.24.fancy/alpine/mailindx.c	2020-10-10 00:26:49.248149033 -0600
+diff -rc alpine-2.25/alpine/mailindx.c alpine-2.25.fancy/alpine/mailindx.c
+*** alpine-2.25/alpine/mailindx.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/mailindx.c	2021-09-18 09:03:09.523012315 -0600
 ***************
 *** 564,569 ****
 --- 564,570 ----
@@ -1189,7 +1189,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   		PINETHRD_S *thrd, *topthrd;
   		for(i = 1L; i > 0L && i <= mn_get_total(msgmap);){
 ***************
-*** 863,869 ****
+*** 865,871 ****
   			      && mp.col == id.plus_col
   			      && style != ThreadIndex){
   			      collapse_or_expand(state, stream, msgmap,
@@ -1197,7 +1197,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   			  }
   			  else if (mp.doubleclick){
   			      if(mp.button == M_BUTTON_LEFT){
---- 866,872 ----
+--- 868,874 ----
   			      && mp.col == id.plus_col
   			      && style != ThreadIndex){
   			      collapse_or_expand(state, stream, msgmap,
@@ -1206,7 +1206,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   			  else if (mp.doubleclick){
   			      if(mp.button == M_BUTTON_LEFT){
 ***************
-*** 972,980 ****
+*** 974,982 ****
   
   
   	  case MC_COLLAPSE :
@@ -1216,7 +1216,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
             case MC_DELETE :
             case MC_UNDELETE :
             case MC_REPLY :
---- 975,1079 ----
+--- 977,1081 ----
   
   
   	  case MC_COLLAPSE :
@@ -1323,7 +1323,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
             case MC_UNDELETE :
             case MC_REPLY :
 ***************
-*** 995,1007 ****
+*** 997,1009 ****
   		  if(rawno)
   		    thrd = fetch_thread(stream, rawno);
   
@@ -1337,7 +1337,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   		  /* increment current */
   		  if(cmd == MC_DELETE){
   		      advance_cur_after_delete(state, stream, msgmap,
---- 1094,1105 ----
+--- 1096,1107 ----
   		  if(rawno)
   		    thrd = fetch_thread(stream, rawno);
   
@@ -1351,8 +1351,8 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   		  if(cmd == MC_DELETE){
   		      advance_cur_after_delete(state, stream, msgmap,
 ***************
-*** 2692,2697 ****
---- 2790,2796 ----
+*** 2696,2701 ****
+--- 2794,2800 ----
   		      n = mn_raw2m(msgs, thrd->rawno);
   
   		    while(thrd){
@@ -1361,7 +1361,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   			   && (++m % lines_per_page) == 1L)
   			  t = n;
 ***************
-*** 2760,2770 ****
+*** 2764,2774 ****
   
   	    /* n is the end of this thread */
   	    while(thrd){
@@ -1373,7 +1373,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   		else
   		  thrd = NULL;
   	    }
---- 2859,2870 ----
+--- 2863,2874 ----
   
   	    /* n is the end of this thread */
   	    while(thrd){
@@ -1387,7 +1387,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   		  thrd = NULL;
   	    }
 ***************
-*** 2872,2878 ****
+*** 2876,2882 ****
   
   void
   thread_command(struct pine *state, MAILSTREAM *stream, MSGNO_S *msgmap,
@@ -1395,7 +1395,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   {
       PINETHRD_S   *thrd = NULL;
       unsigned long rawno, save_branch;
---- 2972,2978 ----
+--- 2976,2982 ----
   
   void
   thread_command(struct pine *state, MAILSTREAM *stream, MSGNO_S *msgmap,
@@ -1404,7 +1404,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
       PINETHRD_S   *thrd = NULL;
       unsigned long rawno, save_branch;
 ***************
-*** 2921,2927 ****
+*** 2925,2931 ****
         cancel_busy_cue(0);
   
       (void ) apply_command(state, stream, msgmap, preloadkeystroke, flags,
@@ -1412,7 +1412,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   
       /* restore the original flags */
       copy_lflags(stream, msgmap, MN_STMP, MN_SLCT);
---- 3021,3027 ----
+--- 3025,3031 ----
         cancel_busy_cue(0);
   
       (void ) apply_command(state, stream, msgmap, preloadkeystroke, flags,
@@ -1421,7 +1421,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
       /* restore the original flags */
       copy_lflags(stream, msgmap, MN_STMP, MN_SLCT);
 ***************
-*** 3438,3444 ****
+*** 3442,3448 ****
       if(set){
   	sort_folder(ps_global->mail_stream, ps_global->msgmap,
   		    order & 0x000000ff,
@@ -1429,7 +1429,7 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   	mswin_beginupdate();
   	update_titlebar_message();
   	update_titlebar_status();
---- 3538,3544 ----
+--- 3542,3548 ----
       if(set){
   	sort_folder(ps_global->mail_stream, ps_global->msgmap,
   		    order & 0x000000ff,
@@ -1437,9 +1437,9 @@ diff -rc alpine-2.24/alpine/mailindx.c alpine-2.24.fancy/alpine/mailindx.c
   	mswin_beginupdate();
   	update_titlebar_message();
   	update_titlebar_status();
-diff -rc alpine-2.24/alpine/mailindx.h alpine-2.24.fancy/alpine/mailindx.h
-*** alpine-2.24/alpine/mailindx.h	2020-10-10 00:24:28.212554806 -0600
---- alpine-2.24.fancy/alpine/mailindx.h	2020-10-10 00:26:49.256149239 -0600
+diff -rc alpine-2.25/alpine/mailindx.h alpine-2.25.fancy/alpine/mailindx.h
+*** alpine-2.25/alpine/mailindx.h	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.fancy/alpine/mailindx.h	2021-09-18 09:03:09.523012315 -0600
 ***************
 *** 103,109 ****
   void		 paint_index_hline(MAILSTREAM *, long, ICE_S *);
@@ -1457,9 +1457,9 @@ diff -rc alpine-2.24/alpine/mailindx.h alpine-2.24.fancy/alpine/mailindx.h
   COLOR_PAIR      *apply_rev_color(COLOR_PAIR *, int);
   #ifdef	_WINDOWS
   int		 index_sort_callback(int, long);
-diff -rc alpine-2.24/alpine/mailview.c alpine-2.24.fancy/alpine/mailview.c
-*** alpine-2.24/alpine/mailview.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.fancy/alpine/mailview.c	2020-10-10 00:26:49.264149441 -0600
+diff -rc alpine-2.25/alpine/mailview.c alpine-2.25.fancy/alpine/mailview.c
+*** alpine-2.25/alpine/mailview.c	2021-09-18 09:02:36.350783312 -0600
+--- alpine-2.25.fancy/alpine/mailview.c	2021-09-18 09:03:09.523012315 -0600
 ***************
 *** 3496,3501 ****
 --- 3496,3547 ----
@@ -1515,11 +1515,11 @@ diff -rc alpine-2.24/alpine/mailview.c alpine-2.24.fancy/alpine/mailview.c
   
   	    /* ------- First handle on Line ------ */
   	  case MC_GOTOBOL :
-diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
-*** alpine-2.24/alpine/roleconf.c	2020-10-10 00:24:28.212554806 -0600
---- alpine-2.24.fancy/alpine/roleconf.c	2020-10-10 00:26:49.268149545 -0600
+diff -rc alpine-2.25/alpine/roleconf.c alpine-2.25.fancy/alpine/roleconf.c
+*** alpine-2.25/alpine/roleconf.c	2021-09-18 09:02:36.350783312 -0600
+--- alpine-2.25.fancy/alpine/roleconf.c	2021-09-18 09:03:09.527012342 -0600
 ***************
-*** 4478,4488 ****
+*** 4477,4487 ****
   	ctmp->tool		  = role_sort_tool;
   	ctmp->valoffset	    	  = rindent;
   	ctmp->flags              |= CF_NOSELECT;
@@ -1531,7 +1531,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   
   	/* allow user to set their default sort order */
   	new_confline(&ctmp)->var = &sort_act_var;
---- 4478,4488 ----
+--- 4477,4487 ----
   	ctmp->tool		  = role_sort_tool;
   	ctmp->valoffset	    	  = rindent;
   	ctmp->flags              |= CF_NOSELECT;
@@ -1544,7 +1544,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   	/* allow user to set their default sort order */
   	new_confline(&ctmp)->var = &sort_act_var;
 ***************
-*** 4492,4498 ****
+*** 4491,4497 ****
   	ctmp->tool	      = role_sort_tool;
   	ctmp->valoffset	      = rindent;
   	ctmp->varmem	      = -1;
@@ -1552,7 +1552,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   
   	for(j = 0; j < 2; j++){
   	    for(i = 0; ps->sort_types[i] != EndofList; i++){
---- 4492,4498 ----
+--- 4491,4497 ----
   	ctmp->tool	      = role_sort_tool;
   	ctmp->valoffset	      = rindent;
   	ctmp->varmem	      = -1;
@@ -1561,7 +1561,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   	for(j = 0; j < 2; j++){
   	    for(i = 0; ps->sort_types[i] != EndofList; i++){
 ***************
-*** 4504,4510 ****
+*** 4503,4509 ****
   		ctmp->valoffset	      = rindent;
   		ctmp->varmem	      = i + (j * EndofList);
   		ctmp->value	      = generalized_sort_pretty_value(ps, ctmp,
@@ -1569,7 +1569,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   	    }
   	}
   
---- 4504,4510 ----
+--- 4503,4509 ----
   		ctmp->valoffset	      = rindent;
   		ctmp->varmem	      = i + (j * EndofList);
   		ctmp->value	      = generalized_sort_pretty_value(ps, ctmp,
@@ -1578,7 +1578,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   	}
   
 ***************
-*** 5437,5443 ****
+*** 5436,5442 ****
   	  (*result)->patgrp->stat_boy = PAT_STAT_EITHER;
   
   	if(sort_act){
@@ -1586,7 +1586,7 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   	    (*result)->action->sort_is_set = 1;
   	    (*result)->action->sortorder = def_sort;
   	    (*result)->action->revsort = (def_sort_rev ? 1 : 0);
---- 5437,5443 ----
+--- 5436,5442 ----
   	  (*result)->patgrp->stat_boy = PAT_STAT_EITHER;
   
   	if(sort_act){
@@ -1594,9 +1594,9 @@ diff -rc alpine-2.24/alpine/roleconf.c alpine-2.24.fancy/alpine/roleconf.c
   	    (*result)->action->sort_is_set = 1;
   	    (*result)->action->sortorder = def_sort;
   	    (*result)->action->revsort = (def_sort_rev ? 1 : 0);
-diff -rc alpine-2.24/alpine/setup.c alpine-2.24.fancy/alpine/setup.c
-*** alpine-2.24/alpine/setup.c	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fancy/alpine/setup.c	2020-10-10 00:26:49.272149646 -0600
+diff -rc alpine-2.25/alpine/setup.c alpine-2.25.fancy/alpine/setup.c
+*** alpine-2.25/alpine/setup.c	2021-09-18 09:02:36.350783312 -0600
+--- alpine-2.25.fancy/alpine/setup.c	2021-09-18 09:03:09.527012342 -0600
 ***************
 *** 262,268 ****
   	    ctmpa->flags             |= CF_NOSELECT;
@@ -1690,9 +1690,9 @@ diff -rc alpine-2.24/alpine/setup.c alpine-2.24.fancy/alpine/setup.c
       treat_color_vars_as_text = 0;
       free_saved_config(ps, &vsave, expose_hidden_config);
   #ifdef _WINDOWS
-diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
-*** alpine-2.24/pith/conf.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/conf.c	2020-10-10 00:26:49.280149850 -0600
+diff -rc alpine-2.25/pith/conf.c alpine-2.25.fancy/pith/conf.c
+*** alpine-2.25/pith/conf.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/conf.c	2021-09-18 09:03:09.527012342 -0600
 ***************
 *** 207,212 ****
 --- 207,214 ----
@@ -1705,8 +1705,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
   
   CONF_TXT_T cf_text_folder_sort_rule[] =	"Sets presentation order of folder list entries. Choices: alphabetical,\n# alpha-with-dirs-last, alpha-with-dirs-first.\n# Default: \"alpha-with-directories-last\".";
 ***************
-*** 543,548 ****
---- 545,552 ----
+*** 545,550 ****
+--- 547,554 ----
   	NULL,			cf_text_fcc_name_rule},
   {"sort-key",				0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
   	NULL,			cf_text_sort_key},
@@ -1716,7 +1716,7 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
   	"Address Book Sort Rule",	cf_text_addrbook_sort_rule},
   {"folder-sort-rule",			0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
 ***************
-*** 1613,1619 ****
+*** 1617,1623 ****
       register struct variable *vars = ps->vars;
       int		 obs_header_in_reply = 0,     /* the obs_ variables are to       */
   		 obs_old_style_reply = 0,     /* support backwards compatibility */
@@ -1724,7 +1724,7 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
       long         rvl;
       PINERC_S    *fixedprc = NULL;
       FeatureLevel obs_feature_level;
---- 1617,1623 ----
+--- 1621,1627 ----
       register struct variable *vars = ps->vars;
       int		 obs_header_in_reply = 0,     /* the obs_ variables are to       */
   		 obs_old_style_reply = 0,     /* support backwards compatibility */
@@ -1733,8 +1733,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
       PINERC_S    *fixedprc = NULL;
       FeatureLevel obs_feature_level;
 ***************
-*** 1639,1644 ****
---- 1643,1649 ----
+*** 1643,1648 ****
+--- 1647,1653 ----
       GLO_FEATURE_LEVEL		= cpystr("sappling");
       GLO_OLD_STYLE_REPLY		= cpystr(DF_OLD_STYLE_REPLY);
       GLO_SORT_KEY		= cpystr(DF_SORT_KEY);
@@ -1743,7 +1743,7 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
       GLO_FCC_RULE		= cpystr(DF_FCC_RULE);
       GLO_AB_SORT_RULE		= cpystr(DF_AB_SORT_RULE);
 ***************
-*** 2640,2646 ****
+*** 2645,2651 ****
       set_current_val(&vars[V_ARCHIVED_FOLDERS], TRUE, TRUE);
       set_current_val(&vars[V_INCOMING_FOLDERS], TRUE, TRUE);
       set_current_val(&vars[V_SORT_KEY], TRUE, TRUE);
@@ -1751,7 +1751,7 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
   	snprintf(tmp_20k_buf, SIZEOF_20KBUF, "Sort type \"%.200s\" is invalid", VAR_SORT_KEY);
   	init_error(ps, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf);
   	ps->def_sort = SortArrival;
---- 2645,2651 ----
+--- 2650,2656 ----
       set_current_val(&vars[V_ARCHIVED_FOLDERS], TRUE, TRUE);
       set_current_val(&vars[V_INCOMING_FOLDERS], TRUE, TRUE);
       set_current_val(&vars[V_SORT_KEY], TRUE, TRUE);
@@ -1760,8 +1760,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
   	init_error(ps, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf);
   	ps->def_sort = SortArrival;
 ***************
-*** 2649,2654 ****
---- 2654,2670 ----
+*** 2654,2659 ****
+--- 2659,2675 ----
       else
         ps->def_sort_rev = def_sort_rev;
   
@@ -1780,8 +1780,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
       {NAMEVAL_S *v; int i;
       for(i = 0; (v = save_msg_rules(i)); i++)
 ***************
-*** 3074,3079 ****
---- 3090,3097 ----
+*** 3079,3084 ****
+--- 3095,3102 ----
   	 F_COLOR_LINE_IMPORTANT, h_config_color_thrd_import, PREF_INDX, 0},
   	{"thread-sorts-by-arrival", "Thread Sorts by Arrival",
   	 F_THREAD_SORTS_BY_ARRIVAL, h_config_thread_sorts_by_arrival, PREF_INDX, 0},
@@ -1791,8 +1791,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
   /* Viewer prefs */
   	{"enable-msg-view-addresses", "Enable Message View Address Links",
 ***************
-*** 7868,7873 ****
---- 7886,7893 ----
+*** 7875,7880 ****
+--- 7893,7900 ----
   	return(h_config_fcc_rule);
         case V_SORT_KEY :
   	return(h_config_sort_key);
@@ -1801,12 +1801,12 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fancy/pith/conf.c
         case V_AB_SORT_RULE :
   	return(h_config_ab_sort_rule);
         case V_FLD_SORT_RULE :
-diff -rc alpine-2.24/pith/conf.h alpine-2.24.fancy/pith/conf.h
-*** alpine-2.24/pith/conf.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/conf.h	2020-10-10 00:26:49.280149850 -0600
+diff -rc alpine-2.25/pith/conf.h alpine-2.25.fancy/pith/conf.h
+*** alpine-2.25/pith/conf.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/conf.h	2021-09-18 09:03:09.527012342 -0600
 ***************
-*** 154,159 ****
---- 154,162 ----
+*** 155,160 ****
+--- 155,163 ----
   #define VAR_SORT_KEY		     vars[V_SORT_KEY].current_val.p
   #define GLO_SORT_KEY		     vars[V_SORT_KEY].global_val.p
   #define COM_SORT_KEY		     vars[V_SORT_KEY].cmdline_val.p
@@ -1816,9 +1816,9 @@ diff -rc alpine-2.24/pith/conf.h alpine-2.24.fancy/pith/conf.h
   #define VAR_AB_SORT_RULE	     vars[V_AB_SORT_RULE].current_val.p
   #define GLO_AB_SORT_RULE	     vars[V_AB_SORT_RULE].global_val.p
   #define VAR_FLD_SORT_RULE	     vars[V_FLD_SORT_RULE].current_val.p
-diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fancy/pith/conftype.h
-*** alpine-2.24/pith/conftype.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/conftype.h	2020-10-10 00:26:49.280149850 -0600
+diff -rc alpine-2.25/pith/conftype.h alpine-2.25.fancy/pith/conftype.h
+*** alpine-2.25/pith/conftype.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/conftype.h	2021-09-18 09:03:09.527012342 -0600
 ***************
 *** 59,64 ****
 --- 59,65 ----
@@ -1830,8 +1830,8 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fancy/pith/conftype.h
   		, V_FLD_SORT_RULE
   		, V_GOTO_DEFAULT_RULE
 ***************
-*** 526,531 ****
---- 527,533 ----
+*** 528,533 ****
+--- 529,535 ----
   	F_QUELL_TIMEZONE,
   	F_QUELL_USERAGENT,
   	F_COLOR_LINE_IMPORTANT,
@@ -1840,19 +1840,19 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fancy/pith/conftype.h
   	F_ENABLE_FULL_HDR_AND_TEXT,
   	F_QUELL_FULL_HDR_RESET,
 ***************
-*** 791,795 ****
---- 793,798 ----
+*** 793,797 ****
+--- 795,800 ----
   
   /* exported prototypes */
   
 + #define DF_THREAD_SORT_KEY  "thread"
   
   #endif /* PITH_CONFTYPE_INCLUDED */
-diff -rc alpine-2.24/pith/flag.c alpine-2.24.fancy/pith/flag.c
-*** alpine-2.24/pith/flag.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/flag.c	2020-10-10 00:26:49.284149951 -0600
+diff -rc alpine-2.25/pith/flag.c alpine-2.25.fancy/pith/flag.c
+*** alpine-2.25/pith/flag.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/flag.c	2021-09-18 09:03:09.527012342 -0600
 ***************
-*** 594,607 ****
+*** 592,605 ****
   
   	was_invisible = (pelt->hidden || pelt->colhid) ? 1 : 0;
   
@@ -1867,7 +1867,7 @@ diff -rc alpine-2.24/pith/flag.c alpine-2.24.fancy/pith/flag.c
   	    }
   
   	    if(topthrd){
---- 594,609 ----
+--- 592,607 ----
   
   	was_invisible = (pelt->hidden || pelt->colhid) ? 1 : 0;
   
@@ -1884,9 +1884,9 @@ diff -rc alpine-2.24/pith/flag.c alpine-2.24.fancy/pith/flag.c
   	    }
   
   	    if(topthrd){
-diff -rc alpine-2.24/pith/indxtype.h alpine-2.24.fancy/pith/indxtype.h
-*** alpine-2.24/pith/indxtype.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/indxtype.h	2020-10-10 00:26:49.292150156 -0600
+diff -rc alpine-2.25/pith/indxtype.h alpine-2.25.fancy/pith/indxtype.h
+*** alpine-2.25/pith/indxtype.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/indxtype.h	2021-09-18 09:03:09.527012342 -0600
 ***************
 *** 78,84 ****
   	      iKey, iKeyInit,
@@ -1904,9 +1904,9 @@ diff -rc alpine-2.24/pith/indxtype.h alpine-2.24.fancy/pith/indxtype.h
   	      iNewsAndTo, iToAndNews, iNewsAndRecips, iRecipsAndNews,
   	      iFromTo, iFromToNotNews, iFrom, iTo, iSender, iCc, iNews, iRecips,
   	      iCurNews, iArrow,
-diff -rc alpine-2.24/pith/mailindx.c alpine-2.24.fancy/pith/mailindx.c
-*** alpine-2.24/pith/mailindx.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/mailindx.c	2020-10-10 00:26:49.300150359 -0600
+diff -rc alpine-2.25/pith/mailindx.c alpine-2.25.fancy/pith/mailindx.c
+*** alpine-2.25/pith/mailindx.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/mailindx.c	2021-09-18 09:03:09.527012342 -0600
 ***************
 *** 229,234 ****
 --- 229,235 ----
@@ -2098,9 +2098,9 @@ diff -rc alpine-2.24/pith/mailindx.c alpine-2.24.fancy/pith/mailindx.c
   	fptr = str;
   
   	if(thd)
-diff -rc alpine-2.24/pith/pattern.c alpine-2.24.fancy/pith/pattern.c
-*** alpine-2.24/pith/pattern.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/pattern.c	2020-10-10 00:26:49.308150564 -0600
+diff -rc alpine-2.25/pith/pattern.c alpine-2.25.fancy/pith/pattern.c
+*** alpine-2.25/pith/pattern.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/pattern.c	2021-09-18 09:03:09.531012370 -0600
 ***************
 *** 1756,1762 ****
   	    SortOrder def_sort;
@@ -2118,12 +2118,12 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.fancy/pith/pattern.c
   		action->sort_is_set = 1;
   		action->sortorder = def_sort;
   		action->revsort   = (def_sort_rev ? 1 : 0);
-diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fancy/pith/pine.hlp
-*** alpine-2.24/pith/pine.hlp	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/pine.hlp	2020-10-10 00:26:49.316150767 -0600
+diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.fancy/pith/pine.hlp
+*** alpine-2.25/pith/pine.hlp	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/pine.hlp	2021-09-18 09:03:09.655013226 -0600
 ***************
-*** 5006,5011 ****
---- 5006,5012 ----
+*** 5165,5170 ****
+--- 5165,5171 ----
   <li><a href="h_config_signature_file">OPTION: <!--#echo var="VAR_signature-file"--></a>
   <li><a href="h_config_smtp_server">OPTION: <!--#echo var="VAR_smtp-server"--></a>
   <li><a href="h_config_sort_key">OPTION: <!--#echo var="VAR_sort-key"--></a>
@@ -2132,8 +2132,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fancy/pith/pine.hlp
   <li><a href="h_config_aspell_dictionary">OPTION: <!--#echo var="VAR_aspell-dictionary-list"--></a>
   <li><a href="h_config_sshcmd">OPTION: <!--#echo var="VAR_ssh-command"--></a>
 ***************
-*** 6947,6952 ****
---- 6948,7110 ----
+*** 7106,7111 ****
+--- 7107,7269 ----
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
@@ -2298,8 +2298,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fancy/pith/pine.hlp
   <HTML>
   <HEAD>
 ***************
-*** 20526,20531 ****
---- 20684,20697 ----
+*** 20685,20690 ****
+--- 20843,20856 ----
   <P>
   </DD>
   
@@ -2315,8 +2315,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fancy/pith/pine.hlp
   <DD>
   This token represents the total size, in bytes, of the message.
 ***************
-*** 24214,24219 ****
---- 24380,24424 ----
+*** 24401,24406 ****
+--- 24567,24611 ----
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
@@ -2363,8 +2363,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fancy/pith/pine.hlp
   <HTML>
   <HEAD>
 ***************
-*** 32288,32293 ****
---- 32493,32515 ----
+*** 32466,32471 ****
+--- 32671,32693 ----
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
@@ -2388,9 +2388,9 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fancy/pith/pine.hlp
   ====== h_config_news_cross_deletes =====
   <HTML>
   <HEAD>
-diff -rc alpine-2.24/pith/sort.c alpine-2.24.fancy/pith/sort.c
-*** alpine-2.24/pith/sort.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/sort.c	2020-10-10 00:26:49.316150767 -0600
+diff -rc alpine-2.25/pith/sort.c alpine-2.25.fancy/pith/sort.c
+*** alpine-2.25/pith/sort.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/sort.c	2021-09-18 09:03:09.659013253 -0600
 ***************
 *** 91,97 ****
     ----*/
@@ -2532,9 +2532,9 @@ diff -rc alpine-2.24/pith/sort.c alpine-2.24.fancy/pith/sort.c
       sort_folder(ps_global->mail_stream, ps_global->msgmap,
 ! 		the_sort_order, sort_is_rev, flags, 1);
   }
-diff -rc alpine-2.24/pith/sort.h alpine-2.24.fancy/pith/sort.h
-*** alpine-2.24/pith/sort.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/sort.h	2020-10-10 00:26:49.316150767 -0600
+diff -rc alpine-2.25/pith/sort.h alpine-2.25.fancy/pith/sort.h
+*** alpine-2.25/pith/sort.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/sort.h	2021-09-18 09:03:09.675013364 -0600
 ***************
 *** 23,29 ****
   
@@ -2571,9 +2571,9 @@ diff -rc alpine-2.24/pith/sort.h alpine-2.24.fancy/pith/sort.h
   void	 reset_sort_order(unsigned);
   
   
-diff -rc alpine-2.24/pith/state.c alpine-2.24.fancy/pith/state.c
-*** alpine-2.24/pith/state.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/state.c	2020-10-10 00:26:49.324150972 -0600
+diff -rc alpine-2.25/pith/state.c alpine-2.25.fancy/pith/state.c
+*** alpine-2.25/pith/state.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/state.c	2021-09-18 09:03:09.675013364 -0600
 ***************
 *** 75,80 ****
 --- 75,81 ----
@@ -2584,9 +2584,9 @@ diff -rc alpine-2.24/pith/state.c alpine-2.24.fancy/pith/state.c
       p->def_sort        = SortArrival;
       p->sort_types[0]   = SortSubject;
       p->sort_types[1]   = SortArrival;
-diff -rc alpine-2.24/pith/state.h alpine-2.24.fancy/pith/state.h
-*** alpine-2.24/pith/state.h	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fancy/pith/state.h	2020-10-10 00:26:49.324150972 -0600
+diff -rc alpine-2.25/pith/state.h alpine-2.25.fancy/pith/state.h
+*** alpine-2.25/pith/state.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/state.h	2021-09-18 09:03:09.675013364 -0600
 ***************
 *** 149,154 ****
 --- 149,156 ----
@@ -2599,8 +2599,8 @@ diff -rc alpine-2.24/pith/state.h alpine-2.24.fancy/pith/state.h
   
       unsigned     tcptimeout:1;		/* a tcp timeout is in progress  */
 ***************
-*** 312,317 ****
---- 314,322 ----
+*** 313,318 ****
+--- 315,323 ----
       EditWhich	 ew_for_srch_take;
   
       SortOrder    def_sort,	/* Default sort type */
@@ -2610,9 +2610,9 @@ diff -rc alpine-2.24/pith/state.h alpine-2.24.fancy/pith/state.h
   		 sort_types[22];
   
       int          last_expire_year, last_expire_month;
-diff -rc alpine-2.24/pith/thread.c alpine-2.24.fancy/pith/thread.c
-*** alpine-2.24/pith/thread.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/thread.c	2020-10-10 00:26:49.324150972 -0600
+diff -rc alpine-2.25/pith/thread.c alpine-2.25.fancy/pith/thread.c
+*** alpine-2.25/pith/thread.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/thread.c	2021-09-18 09:03:09.715013639 -0600
 ***************
 *** 30,41 ****
   #include "../pith/mailcmd.h"
@@ -3948,9 +3948,9 @@ diff -rc alpine-2.24/pith/thread.c alpine-2.24.fancy/pith/thread.c
 + 	  || sort == SortSize;
 + }
 + 
-diff -rc alpine-2.24/pith/thread.h alpine-2.24.fancy/pith/thread.h
-*** alpine-2.24/pith/thread.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fancy/pith/thread.h	2020-10-10 00:26:49.328151074 -0600
+diff -rc alpine-2.25/pith/thread.h alpine-2.25.fancy/pith/thread.h
+*** alpine-2.25/pith/thread.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fancy/pith/thread.h	2021-09-18 09:03:09.727013722 -0600
 ***************
 *** 38,43 ****
 --- 38,44 ----
@@ -4011,9 +4011,9 @@ diff -rc alpine-2.24/pith/thread.h alpine-2.24.fancy/pith/thread.h
 ! int	      allowed_thread_key(SortOrder sort);
   
   #endif /* PITH_THREAD_INCLUDED */
-diff -rc alpine-2.24/web/src/alpined.d/alpined.c alpine-2.24.fancy/web/src/alpined.d/alpined.c
-*** alpine-2.24/web/src/alpined.d/alpined.c	2020-10-10 00:24:28.248555724 -0600
---- alpine-2.24.fancy/web/src/alpined.d/alpined.c	2020-10-10 00:26:49.336151277 -0600
+diff -rc alpine-2.25/web/src/alpined.d/alpined.c alpine-2.25.fancy/web/src/alpined.d/alpined.c
+*** alpine-2.25/web/src/alpined.d/alpined.c	2021-09-18 09:02:36.402783672 -0600
+--- alpine-2.25.fancy/web/src/alpined.d/alpined.c	2021-09-18 09:03:09.739013805 -0600
 ***************
 *** 2755,2761 ****
   			      init_save_defaults();
diff --git a/chappa-fillpara.patch b/chappa-fillpara.patch
index 8228985..ef1efe1 100644
--- a/chappa-fillpara.patch
+++ b/chappa-fillpara.patch
@@ -1,6 +1,6 @@
-diff -rc alpine-2.24/alpine/mailview.c alpine-2.24.fillpara/alpine/mailview.c
-*** alpine-2.24/alpine/mailview.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.fillpara/alpine/mailview.c	2020-10-10 00:26:56.228326921 -0600
+diff -rc alpine-2.25/alpine/mailview.c alpine-2.25.fillpara/alpine/mailview.c
+*** alpine-2.25/alpine/mailview.c	2021-09-18 09:02:36.350783312 -0600
+--- alpine-2.25.fillpara/alpine/mailview.c	2021-09-18 09:03:13.523039928 -0600
 ***************
 *** 205,211 ****
 --- 205,219 ----
@@ -50,9 +50,9 @@ diff -rc alpine-2.24/alpine/mailview.c alpine-2.24.fillpara/alpine/mailview.c
       if(we_cancel)
         cancel_busy_cue(-1);
   
-diff -rc alpine-2.24/pico/basic.c alpine-2.24.fillpara/pico/basic.c
-*** alpine-2.24/pico/basic.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.fillpara/pico/basic.c	2020-10-10 00:26:56.228326921 -0600
+diff -rc alpine-2.25/pico/basic.c alpine-2.25.fillpara/pico/basic.c
+*** alpine-2.25/pico/basic.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.fillpara/pico/basic.c	2021-09-18 09:03:13.523039928 -0600
 ***************
 *** 26,34 ****
    * framing, are hard.
@@ -323,9 +323,9 @@ diff -rc alpine-2.24/pico/basic.c alpine-2.24.fillpara/pico/basic.c
   	  curwp->w_dotp = lforw(curwp->w_dotp);
   
   	curwp->w_doto = llength(curwp->w_dotp);
-diff -rc alpine-2.24/pico/efunc.h alpine-2.24.fillpara/pico/efunc.h
-*** alpine-2.24/pico/efunc.h	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.fillpara/pico/efunc.h	2020-10-10 00:26:56.228326921 -0600
+diff -rc alpine-2.25/pico/efunc.h alpine-2.25.fillpara/pico/efunc.h
+*** alpine-2.25/pico/efunc.h	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.fillpara/pico/efunc.h	2021-09-18 09:03:13.527039955 -0600
 ***************
 *** 253,262 ****
   extern	int fillpara(int, int);
@@ -355,9 +355,9 @@ diff -rc alpine-2.24/pico/efunc.h alpine-2.24.fillpara/pico/efunc.h
   
   #endif	/* EFUNC_H */
 + 
-diff -rc alpine-2.24/pico/line.c alpine-2.24.fillpara/pico/line.c
-*** alpine-2.24/pico/line.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.fillpara/pico/line.c	2020-10-10 00:26:56.280328247 -0600
+diff -rc alpine-2.25/pico/line.c alpine-2.25.fillpara/pico/line.c
+*** alpine-2.25/pico/line.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.fillpara/pico/line.c	2021-09-18 09:03:13.575040287 -0600
 ***************
 *** 612,627 ****
   lisblank(LINE *line)
@@ -389,9 +389,9 @@ diff -rc alpine-2.24/pico/line.c alpine-2.24.fillpara/pico/line.c
   	return(FALSE);
   
       return(TRUE);
-diff -rc alpine-2.24/pico/osdep/color.h alpine-2.24.fillpara/pico/osdep/color.h
-*** alpine-2.24/pico/osdep/color.h	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.fillpara/pico/osdep/color.h	2020-10-10 00:26:56.292328552 -0600
+diff -rc alpine-2.25/pico/osdep/color.h alpine-2.25.fillpara/pico/osdep/color.h
+*** alpine-2.25/pico/osdep/color.h	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.fillpara/pico/osdep/color.h	2021-09-18 09:03:13.579040315 -0600
 ***************
 *** 33,38 ****
 --- 33,39 ----
@@ -402,9 +402,9 @@ diff -rc alpine-2.24/pico/osdep/color.h alpine-2.24.fillpara/pico/osdep/color.h
   
   
   #endif /* PICO_OSDEP_COLOR_INCLUDED */
-diff -rc alpine-2.24/pico/search.c alpine-2.24.fillpara/pico/search.c
-*** alpine-2.24/pico/search.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.fillpara/pico/search.c	2020-10-10 00:26:56.304328858 -0600
+diff -rc alpine-2.25/pico/search.c alpine-2.25.fillpara/pico/search.c
+*** alpine-2.25/pico/search.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.fillpara/pico/search.c	2021-09-18 09:03:13.579040315 -0600
 ***************
 *** 36,41 ****
 --- 36,42 ----
@@ -483,9 +483,9 @@ diff -rc alpine-2.24/pico/search.c alpine-2.24.fillpara/pico/search.c
 +    return(TRUE);
 + }
 + 
-diff -rc alpine-2.24/pico/word.c alpine-2.24.fillpara/pico/word.c
-*** alpine-2.24/pico/word.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.fillpara/pico/word.c	2020-10-10 00:26:56.316329164 -0600
+diff -rc alpine-2.25/pico/word.c alpine-2.25.fillpara/pico/word.c
+*** alpine-2.25/pico/word.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.fillpara/pico/word.c	2021-09-18 09:03:13.583040342 -0600
 ***************
 *** 25,34 ****
    */
@@ -1229,12 +1229,12 @@ diff -rc alpine-2.24/pico/word.c alpine-2.24.fillpara/pico/word.c
 +      return get_indent_raw_line(q, GLine, buf, buflen, k, plb);
 + }
 + 
-diff -rc alpine-2.24/pith/charconv/utf8.c alpine-2.24.fillpara/pith/charconv/utf8.c
-*** alpine-2.24/pith/charconv/utf8.c	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fillpara/pith/charconv/utf8.c	2020-10-10 00:26:56.320329266 -0600
+diff -rc alpine-2.25/pith/charconv/utf8.c alpine-2.25.fillpara/pith/charconv/utf8.c
+*** alpine-2.25/pith/charconv/utf8.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/charconv/utf8.c	2021-09-18 09:03:13.583040342 -0600
 ***************
-*** 1066,1071 ****
---- 1066,1121 ----
+*** 1117,1122 ****
+--- 1117,1172 ----
   
   
   /*
@@ -1291,12 +1291,12 @@ diff -rc alpine-2.24/pith/charconv/utf8.c alpine-2.24.fillpara/pith/charconv/utf
    * Copy UTF-8 characters from src into dst.
    * This is intended to be used if you want to truncate a string at
    * the start instead of the end. For example, you have a long string
-diff -rc alpine-2.24/pith/charconv/utf8.h alpine-2.24.fillpara/pith/charconv/utf8.h
-*** alpine-2.24/pith/charconv/utf8.h	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fillpara/pith/charconv/utf8.h	2020-10-10 00:26:56.328329469 -0600
+diff -rc alpine-2.25/pith/charconv/utf8.h alpine-2.25.fillpara/pith/charconv/utf8.h
+*** alpine-2.25/pith/charconv/utf8.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/charconv/utf8.h	2021-09-18 09:03:13.583040342 -0600
 ***************
-*** 81,86 ****
---- 81,87 ----
+*** 82,87 ****
+--- 82,88 ----
   UCS           *ucs4_strchr(UCS *s, UCS c);
   UCS           *ucs4_strrchr(UCS *s, UCS c);
   unsigned       utf8_width(char *);
@@ -1304,9 +1304,9 @@ diff -rc alpine-2.24/pith/charconv/utf8.h alpine-2.24.fillpara/pith/charconv/utf
   size_t         utf8_to_width_rhs(char *, char *, size_t, unsigned);
   int            utf8_snprintf(char *, size_t, char *, ...);
   size_t         utf8_to_width(char *, char *, size_t, unsigned, unsigned *);
-diff -rc alpine-2.24/pith/color.c alpine-2.24.fillpara/pith/color.c
-*** alpine-2.24/pith/color.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/color.c	2020-10-10 00:26:56.344329877 -0600
+diff -rc alpine-2.25/pith/color.c alpine-2.25.fillpara/pith/color.c
+*** alpine-2.25/pith/color.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/color.c	2021-09-18 09:03:13.583040342 -0600
 ***************
 *** 21,27 ****
   #include "../pith/state.h"
@@ -1517,9 +1517,9 @@ diff -rc alpine-2.24/pith/color.c alpine-2.24.fillpara/pith/color.c
   }
   
   
-diff -rc alpine-2.24/pith/color.h alpine-2.24.fillpara/pith/color.h
-*** alpine-2.24/pith/color.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/color.h	2020-10-10 00:26:56.364330387 -0600
+diff -rc alpine-2.25/pith/color.h alpine-2.25.fillpara/pith/color.h
+*** alpine-2.25/pith/color.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/color.h	2021-09-18 09:03:13.583040342 -0600
 ***************
 *** 22,27 ****
 --- 22,45 ----
@@ -1557,9 +1557,9 @@ diff -rc alpine-2.24/pith/color.h alpine-2.24.fillpara/pith/color.h
   int	 color_a_quote(long, char *, LT_INS_S **, void *);
   void	 free_spec_colors(SPEC_COLOR_S **);
   
-diff -rc alpine-2.24/pith/filter.c alpine-2.24.fillpara/pith/filter.c
-*** alpine-2.24/pith/filter.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/filter.c	2020-10-10 00:26:56.380330795 -0600
+diff -rc alpine-2.25/pith/filter.c alpine-2.25.fillpara/pith/filter.c
+*** alpine-2.25/pith/filter.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/filter.c	2021-09-18 09:03:13.591040398 -0600
 ***************
 *** 46,51 ****
 --- 46,52 ----
@@ -2185,9 +2185,9 @@ diff -rc alpine-2.24/pith/filter.c alpine-2.24.fillpara/pith/filter.c
   
   /*
    * this simple filter accumulates characters until a newline, offers it
-diff -rc alpine-2.24/pith/filter.h alpine-2.24.fillpara/pith/filter.h
-*** alpine-2.24/pith/filter.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/filter.h	2020-10-10 00:26:56.380330795 -0600
+diff -rc alpine-2.25/pith/filter.h alpine-2.25.fillpara/pith/filter.h
+*** alpine-2.25/pith/filter.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/filter.h	2021-09-18 09:03:13.591040398 -0600
 ***************
 *** 217,222 ****
 --- 217,223 ----
@@ -2198,9 +2198,9 @@ diff -rc alpine-2.24/pith/filter.h alpine-2.24.fillpara/pith/filter.h
   void	   *gf_url_hilite_opt(URL_HILITE_S *, HANDLE_S **, int);
   void	    free_filter_module_globals(void);
   
-diff -rc alpine-2.24/pith/filttype.h alpine-2.24.fillpara/pith/filttype.h
-*** alpine-2.24/pith/filttype.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/filttype.h	2020-10-10 00:26:56.384330897 -0600
+diff -rc alpine-2.25/pith/filttype.h alpine-2.25.fillpara/pith/filttype.h
+*** alpine-2.25/pith/filttype.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/filttype.h	2021-09-18 09:03:13.591040398 -0600
 ***************
 *** 36,41 ****
 --- 36,43 ----
@@ -2212,9 +2212,9 @@ diff -rc alpine-2.24/pith/filttype.h alpine-2.24.fillpara/pith/filttype.h
       void     *opt;		/* optional per instance data		 */
       void     *data;		/* misc internal data pointer		 */
       unsigned char queue[1 + GF_MAXBUF];
-diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
-*** alpine-2.24/pith/mailview.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/mailview.c	2020-10-10 00:26:56.396331203 -0600
+diff -rc alpine-2.25/pith/mailview.c alpine-2.25.fillpara/pith/mailview.c
+*** alpine-2.25/pith/mailview.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/mailview.c	2021-09-18 09:03:13.603040480 -0600
 ***************
 *** 55,61 ****
   #include "../pith/escapes.h"
@@ -2237,7 +2237,7 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
   #define FBUF_LEN	(50)
   
 ***************
-*** 640,646 ****
+*** 638,644 ****
   	       && pico_usingcolor()
   	       && ps_global->VAR_SIGNATURE_FORE_COLOR
   	       && ps_global->VAR_SIGNATURE_BACK_COLOR){
@@ -2245,7 +2245,7 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
   	    }
   
   	    if((flgs & FM_DISPLAY)
---- 644,650 ----
+--- 642,648 ----
   	       && pico_usingcolor()
   	       && ps_global->VAR_SIGNATURE_FORE_COLOR
   	       && ps_global->VAR_SIGNATURE_BACK_COLOR){
@@ -2254,7 +2254,7 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
   
   	    if((flgs & FM_DISPLAY)
 ***************
-*** 648,655 ****
+*** 646,653 ****
   	       && pico_usingcolor()
   	       && ps_global->VAR_QUOTE1_FORE_COLOR
   	       && ps_global->VAR_QUOTE1_BACK_COLOR){
@@ -2263,7 +2263,7 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
   
   	    if(!(flgs & FM_NOWRAP)){
   		wrapflags = (flgs & FM_DISPLAY) ? (GFW_HANDLES|GFW_SOFTHYPHEN) : GFW_NONE;
---- 652,661 ----
+--- 650,659 ----
   	       && pico_usingcolor()
   	       && ps_global->VAR_QUOTE1_FORE_COLOR
   	       && ps_global->VAR_QUOTE1_BACK_COLOR){
@@ -2275,7 +2275,7 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
   	    if(!(flgs & FM_NOWRAP)){
   		wrapflags = (flgs & FM_DISPLAY) ? (GFW_HANDLES|GFW_SOFTHYPHEN) : GFW_NONE;
 ***************
-*** 1465,1491 ****
+*** 1463,1489 ****
   color_signature(long int linenum, char *line, LT_INS_S **ins, void *is_in_sig)
   {
       struct variable *vars = ps_global->vars;
@@ -2303,7 +2303,7 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
       if(*in_sig_block != OUT_SIG_BLOCK
          && VAR_SIGNATURE_FORE_COLOR && VAR_SIGNATURE_BACK_COLOR
          && (col = new_color_pair(VAR_SIGNATURE_FORE_COLOR,
---- 1471,1558 ----
+--- 1469,1556 ----
   color_signature(long int linenum, char *line, LT_INS_S **ins, void *is_in_sig)
   {
       struct variable *vars = ps_global->vars;
@@ -2393,8 +2393,8 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
          && VAR_SIGNATURE_FORE_COLOR && VAR_SIGNATURE_BACK_COLOR
          && (col = new_color_pair(VAR_SIGNATURE_FORE_COLOR,
 ***************
-*** 2045,2050 ****
---- 2112,2188 ----
+*** 2043,2048 ****
+--- 2110,2186 ----
   }
   
   
@@ -2472,9 +2472,9 @@ diff -rc alpine-2.24/pith/mailview.c alpine-2.24.fillpara/pith/mailview.c
   
   #define	UES_LEN	12
   #define	UES_MAX	32
-diff -rc alpine-2.24/pith/mailview.h alpine-2.24.fillpara/pith/mailview.h
-*** alpine-2.24/pith/mailview.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/mailview.h	2020-10-10 00:26:56.404331406 -0600
+diff -rc alpine-2.25/pith/mailview.h alpine-2.25.fillpara/pith/mailview.h
+*** alpine-2.25/pith/mailview.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/mailview.h	2021-09-18 09:03:13.603040480 -0600
 ***************
 *** 146,151 ****
 --- 146,152 ----
@@ -2485,9 +2485,9 @@ diff -rc alpine-2.24/pith/mailview.h alpine-2.24.fillpara/pith/mailview.h
   int	    scroll_handle_start_color(char *, size_t, int *);
   int	    scroll_handle_end_color(char *, size_t, int *, int);
   int         width_at_this_position(unsigned char *, unsigned long);
-diff -rc alpine-2.24/pith/osdep/color.c alpine-2.24.fillpara/pith/osdep/color.c
-*** alpine-2.24/pith/osdep/color.c	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fillpara/pith/osdep/color.c	2020-10-10 00:26:56.416331712 -0600
+diff -rc alpine-2.25/pith/osdep/color.c alpine-2.25.fillpara/pith/osdep/color.c
+*** alpine-2.25/pith/osdep/color.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/osdep/color.c	2021-09-18 09:03:13.611040536 -0600
 ***************
 *** 32,38 ****
   
@@ -3792,9 +3792,9 @@ diff -rc alpine-2.24/pith/osdep/color.c alpine-2.24.fillpara/pith/osdep/color.c
 +   return allowed_qstr;
 + }
 + 
-diff -rc alpine-2.24/pith/osdep/color.h alpine-2.24.fillpara/pith/osdep/color.h
-*** alpine-2.24/pith/osdep/color.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/osdep/color.h	2020-10-10 00:26:56.436332222 -0600
+diff -rc alpine-2.25/pith/osdep/color.h alpine-2.25.fillpara/pith/osdep/color.h
+*** alpine-2.25/pith/osdep/color.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/osdep/color.h	2021-09-18 09:03:13.615040563 -0600
 ***************
 *** 17,22 ****
 --- 17,40 ----
@@ -3845,12 +3845,12 @@ diff -rc alpine-2.24/pith/osdep/color.h alpine-2.24.fillpara/pith/osdep/color.h
 ! void	    record_quote_string (QSTRING_S *);
   
   #endif /* PITH_OSDEP_COLOR_INCLUDED */
-diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fillpara/pith/pine.hlp
-*** alpine-2.24/pith/pine.hlp	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/pine.hlp	2020-10-10 00:26:56.460332833 -0600
+diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.fillpara/pith/pine.hlp
+*** alpine-2.25/pith/pine.hlp	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/pine.hlp	2021-09-18 09:03:13.627040646 -0600
 ***************
-*** 8195,8200 ****
---- 8195,8240 ----
+*** 8354,8359 ****
+--- 8354,8399 ----
   &quot;type the character ^&quot;.
   
   <P>
@@ -3897,9 +3897,9 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fillpara/pith/pine.hlp
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
-diff -rc alpine-2.24/pith/reply.c alpine-2.24.fillpara/pith/reply.c
-*** alpine-2.24/pith/reply.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/reply.c	2020-10-10 00:26:56.460332833 -0600
+diff -rc alpine-2.25/pith/reply.c alpine-2.25.fillpara/pith/reply.c
+*** alpine-2.25/pith/reply.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/reply.c	2021-09-18 09:03:13.631040673 -0600
 ***************
 *** 2838,2843 ****
 --- 2838,2846 ----
@@ -3929,9 +3929,9 @@ diff -rc alpine-2.24/pith/reply.c alpine-2.24.fillpara/pith/reply.c
   	filters[filtcnt++].data = gf_line_test_opt(delete_quotes, &dq);
       }
   
-diff -rc alpine-2.24/pith/state.c alpine-2.24.fillpara/pith/state.c
-*** alpine-2.24/pith/state.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/state.c	2020-10-10 00:26:56.464332936 -0600
+diff -rc alpine-2.25/pith/state.c alpine-2.25.fillpara/pith/state.c
+*** alpine-2.25/pith/state.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/state.c	2021-09-18 09:03:13.631040673 -0600
 ***************
 *** 235,240 ****
 --- 235,242 ----
@@ -3943,12 +3943,12 @@ diff -rc alpine-2.24/pith/state.c alpine-2.24.fillpara/pith/state.c
       if((*pps)->atmts){
   	int i;
   
-diff -rc alpine-2.24/pith/state.h alpine-2.24.fillpara/pith/state.h
-*** alpine-2.24/pith/state.h	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.fillpara/pith/state.h	2020-10-10 00:26:56.468333038 -0600
+diff -rc alpine-2.25/pith/state.h alpine-2.25.fillpara/pith/state.h
+*** alpine-2.25/pith/state.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/state.h	2021-09-18 09:03:13.631040673 -0600
 ***************
-*** 261,266 ****
---- 261,268 ----
+*** 262,267 ****
+--- 262,269 ----
       SPEC_COLOR_S *hdr_colors;		/* list of configured colors for view */
       SPEC_COLOR_S *index_token_colors;	/* list of configured colors for index */
   
@@ -3957,9 +3957,9 @@ diff -rc alpine-2.24/pith/state.h alpine-2.24.fillpara/pith/state.h
       short	 init_context;
   
       struct { 
-diff -rc alpine-2.24/pith/text.c alpine-2.24.fillpara/pith/text.c
-*** alpine-2.24/pith/text.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fillpara/pith/text.c	2020-10-10 00:26:56.468333038 -0600
+diff -rc alpine-2.25/pith/text.c alpine-2.25.fillpara/pith/text.c
+*** alpine-2.25/pith/text.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fillpara/pith/text.c	2021-09-18 09:03:13.643040757 -0600
 ***************
 *** 92,98 ****
       char       *err, *charset;
@@ -4069,7 +4069,7 @@ diff -rc alpine-2.24/pith/text.c alpine-2.24.fillpara/pith/text.c
       DELQ_S *dq;
       char   *lp;
 !     int     i, lines, not_a_quote = 0;
-      size_t  len;
+      size_t  len = 0;
   
       dq = (DELQ_S *) local;
 --- 574,580 ----
@@ -4077,7 +4077,7 @@ diff -rc alpine-2.24/pith/text.c alpine-2.24.fillpara/pith/text.c
       DELQ_S *dq;
       char   *lp;
 !     int     i, lines, not_a_quote = 0, code;
-      size_t  len;
+      size_t  len = 0;
   
       dq = (DELQ_S *) local;
 ***************
diff --git a/chappa-fromheader.patch b/chappa-fromheader.patch
index 50aac01..ff1d5c5 100644
--- a/chappa-fromheader.patch
+++ b/chappa-fromheader.patch
@@ -1,6 +1,6 @@
-diff -rc alpine-2.24/alpine/send.c alpine-2.24.fromheader/alpine/send.c
-*** alpine-2.24/alpine/send.c	2020-10-10 00:24:28.212554806 -0600
---- alpine-2.24.fromheader/alpine/send.c	2020-10-10 00:26:58.004372183 -0600
+diff -rc alpine-2.25/alpine/send.c alpine-2.25.fromheader/alpine/send.c
+*** alpine-2.25/alpine/send.c	2021-09-18 09:02:36.350783312 -0600
+--- alpine-2.25.fromheader/alpine/send.c	2021-09-18 09:03:16.987063842 -0600
 ***************
 *** 908,914 ****
      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KS_NONE},
@@ -51,12 +51,12 @@ diff -rc alpine-2.24/alpine/send.c alpine-2.24.fromheader/alpine/send.c
   
   	/*
   	 * Don't ever believe the sender that is there.
-diff -rc alpine-2.24/pith/conf.c alpine-2.24.fromheader/pith/conf.c
-*** alpine-2.24/pith/conf.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fromheader/pith/conf.c	2020-10-10 00:26:58.004372183 -0600
+diff -rc alpine-2.25/pith/conf.c alpine-2.25.fromheader/pith/conf.c
+*** alpine-2.25/pith/conf.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fromheader/pith/conf.c	2021-09-18 09:03:16.991063870 -0600
 ***************
-*** 2984,2989 ****
---- 2984,2991 ----
+*** 2989,2994 ****
+--- 2989,2996 ----
   	 F_NO_FCC_ATTACH, h_config_no_fcc_attach, PREF_SEND, 0},
   	{"fcc-on-bounce", "Include Fcc When Bouncing Messages",
   	 F_FCC_ON_BOUNCE, h_config_fcc_on_bounce, PREF_SEND, 0},
@@ -65,12 +65,12 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.fromheader/pith/conf.c
   	{"mark-fcc-seen", NULL,
   	 F_MARK_FCC_SEEN, h_config_mark_fcc_seen, PREF_SEND, 0},
   	{"fcc-only-without-confirm", "Send to Fcc Only Without Confirming",
-diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fromheader/pith/conftype.h
-*** alpine-2.24/pith/conftype.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fromheader/pith/conftype.h	2020-10-10 00:26:58.004372183 -0600
+diff -rc alpine-2.25/pith/conftype.h alpine-2.25.fromheader/pith/conftype.h
+*** alpine-2.25/pith/conftype.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fromheader/pith/conftype.h	2021-09-18 09:03:16.991063870 -0600
 ***************
-*** 410,415 ****
---- 410,416 ----
+*** 412,417 ****
+--- 412,418 ----
   	F_AUTO_REPLY_TO,
   	F_VERBOSE_POST,
   	F_FCC_ON_BOUNCE,
@@ -78,12 +78,12 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.fromheader/pith/conftype.h
   	F_SEND_WO_CONFIRM,
   	F_USE_SENDER_NOT_X,
   	F_BLANK_KEYMENU,
-diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fromheader/pith/pine.hlp
-*** alpine-2.24/pith/pine.hlp	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fromheader/pith/pine.hlp	2020-10-10 00:26:58.016372489 -0600
+diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.fromheader/pith/pine.hlp
+*** alpine-2.25/pith/pine.hlp	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fromheader/pith/pine.hlp	2021-09-18 09:03:17.047064257 -0600
 ***************
-*** 30135,30140 ****
---- 30135,30156 ----
+*** 30313,30318 ****
+--- 30313,30334 ----
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
@@ -106,9 +106,9 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.fromheader/pith/pine.hlp
   ====== h_config_use_sender_not_x =====
   <HTML>
   <HEAD>
-diff -rc alpine-2.24/pith/send.c alpine-2.24.fromheader/pith/send.c
-*** alpine-2.24/pith/send.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fromheader/pith/send.c	2020-10-10 00:26:58.016372489 -0600
+diff -rc alpine-2.25/pith/send.c alpine-2.25.fromheader/pith/send.c
+*** alpine-2.25/pith/send.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fromheader/pith/send.c	2021-09-18 09:03:17.047064257 -0600
 ***************
 *** 53,59 ****
   /* name::type::canedit::writehdr::localcopy::rcptto */
@@ -143,9 +143,9 @@ diff -rc alpine-2.24/pith/send.c alpine-2.24.fromheader/pith/send.c
   	pf->rcptto      = pf_template[i].rcptto;
   	pf->writehdr    = pf_template[i].writehdr;
   	pf->localcopy   = pf_template[i].localcopy;
-diff -rc alpine-2.24/pith/send.h alpine-2.24.fromheader/pith/send.h
-*** alpine-2.24/pith/send.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.fromheader/pith/send.h	2020-10-10 00:26:58.016372489 -0600
+diff -rc alpine-2.25/pith/send.h alpine-2.25.fromheader/pith/send.h
+*** alpine-2.25/pith/send.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.fromheader/pith/send.h	2021-09-18 09:03:17.087064532 -0600
 ***************
 *** 159,164 ****
 --- 159,166 ----
diff --git a/chappa-insertpat.patch b/chappa-insertpat.patch
index b6c1c0b..6d2afa0 100644
--- a/chappa-insertpat.patch
+++ b/chappa-insertpat.patch
@@ -1,9 +1,9 @@
-diff -rc alpine-2.24/pico/display.c alpine-2.24.insertpat/pico/display.c
-*** alpine-2.24/pico/display.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.insertpat/pico/display.c	2020-10-10 00:26:59.856419380 -0600
+diff -rc alpine-2.25/pico/display.c alpine-2.25.insertpat/pico/display.c
+*** alpine-2.25/pico/display.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.insertpat/pico/display.c	2021-09-18 09:03:18.847076682 -0600
 ***************
-*** 2205,2210 ****
---- 2205,2222 ----
+*** 2200,2205 ****
+--- 2200,2217 ----
   
   	    continue;
   
@@ -22,9 +22,9 @@ diff -rc alpine-2.24/pico/display.c alpine-2.24.insertpat/pico/display.c
   	  case (CTRL|'G') :			/* CTRL-G help		*/
   	    if(term.t_mrow == 0 && km_popped == 0){
   		movecursor(term.t_nrow-2, 0);
-diff -rc alpine-2.24/pico/search.c alpine-2.24.insertpat/pico/search.c
-*** alpine-2.24/pico/search.c	2020-10-10 00:24:28.180553991 -0600
---- alpine-2.24.insertpat/pico/search.c	2020-10-10 00:26:59.856419380 -0600
+diff -rc alpine-2.25/pico/search.c alpine-2.25.insertpat/pico/search.c
+*** alpine-2.25/pico/search.c	2021-09-18 09:02:36.386783561 -0600
+--- alpine-2.25.insertpat/pico/search.c	2021-09-18 09:03:18.847076682 -0600
 ***************
 *** 122,127 ****
 --- 122,131 ----
diff --git a/chappa-maildir.patch b/chappa-maildir.patch
index f639a60..e507dfd 100644
--- a/chappa-maildir.patch
+++ b/chappa-maildir.patch
@@ -1,9 +1,9 @@
-diff -rc alpine-2.24/alpine/alpine.c alpine-2.24.maildir/alpine/alpine.c
-*** alpine-2.24/alpine/alpine.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.maildir/alpine/alpine.c	2020-10-10 00:26:49.964167282 -0600
+diff -rc alpine-2.25/alpine/alpine.c alpine-2.25.maildir/alpine/alpine.c
+*** alpine-2.25/alpine/alpine.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.maildir/alpine/alpine.c	2021-09-18 09:03:10.599019743 -0600
 ***************
-*** 591,596 ****
---- 591,601 ----
+*** 597,602 ****
+--- 597,607 ----
       if(F_ON(F_MAILDROPS_PRESERVE_STATE, ps_global))
         mail_parameters(NULL, SET_SNARFPRESERVE, (void *) TRUE);
   
@@ -15,9 +15,9 @@ diff -rc alpine-2.24/alpine/alpine.c alpine-2.24.maildir/alpine/alpine.c
       rvl = 0L;
       if(pine_state->VAR_NNTPRANGE){
   	if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF))
-diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.maildir/alpine/confscroll.c
-*** alpine-2.24/alpine/confscroll.c	2020-10-10 00:24:28.216554908 -0600
---- alpine-2.24.maildir/alpine/confscroll.c	2020-10-10 00:26:49.968167384 -0600
+diff -rc alpine-2.25/alpine/confscroll.c alpine-2.25.maildir/alpine/confscroll.c
+*** alpine-2.25/alpine/confscroll.c	2021-09-18 09:02:36.346783285 -0600
+--- alpine-2.25.maildir/alpine/confscroll.c	2021-09-18 09:03:10.603019770 -0600
 ***************
 *** 5567,5572 ****
 --- 5567,5578 ----
@@ -33,11 +33,11 @@ diff -rc alpine-2.24/alpine/confscroll.c alpine-2.24.maildir/alpine/confscroll.c
       else if(revert && standard_radio_var(ps, var)){
   
   	cur_rule_value(var, TRUE, FALSE);
-diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.maildir/imap/src/c-client/mail.c
-*** alpine-2.24/imap/src/c-client/mail.c	2020-10-10 00:24:28.200554500 -0600
---- alpine-2.24.maildir/imap/src/c-client/mail.c	2020-10-10 00:26:49.968167384 -0600
+diff -rc alpine-2.25/imap/src/c-client/mail.c alpine-2.25.maildir/imap/src/c-client/mail.c
+*** alpine-2.25/imap/src/c-client/mail.c	2021-09-18 09:02:36.366783422 -0600
+--- alpine-2.25.maildir/imap/src/c-client/mail.c	2021-09-18 09:03:10.603019770 -0600
 ***************
-*** 1063,1069 ****
+*** 1071,1077 ****
     MAILSTREAM *ts;
     char *s,*t,tmp[MAILTMPLEN];
     size_t i;
@@ -45,7 +45,7 @@ diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.maildir/imap/src/c-cli
   				/* never allow names with newlines */
     if ((s = strpbrk (mailbox,"\015\012")) != NULL) {
       MM_LOG ("Can't create mailbox with such a name",ERROR);
---- 1063,1069 ----
+--- 1071,1077 ----
     MAILSTREAM *ts;
     char *s,*t,tmp[MAILTMPLEN];
     size_t i;
@@ -54,8 +54,8 @@ diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.maildir/imap/src/c-cli
     if ((s = strpbrk (mailbox,"\015\012")) != NULL) {
       MM_LOG ("Can't create mailbox with such a name",ERROR);
 ***************
-*** 1087,1092 ****
---- 1087,1094 ----
+*** 1095,1100 ****
+--- 1095,1102 ----
       return NIL;
     }
   
@@ -65,8 +65,8 @@ diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.maildir/imap/src/c-cli
     if ((mailbox[0] == '#') && ((mailbox[1] == 'd') || (mailbox[1] == 'D')) &&
         ((mailbox[2] == 'r') || (mailbox[2] == 'R')) &&
 ***************
-*** 1117,1122 ****
---- 1119,1131 ----
+*** 1125,1130 ****
+--- 1127,1139 ----
   	   (((*mailbox == '{') || (*mailbox == '#')) &&
   	    (stream = mail_open (NIL,mailbox,OP_PROTOTYPE | OP_SILENT))))
       d = stream->dtb;
@@ -80,12 +80,12 @@ diff -rc alpine-2.24/imap/src/c-client/mail.c alpine-2.24.maildir/imap/src/c-cli
     else if ((*mailbox != '{') && (ts = default_proto (NIL))) d = ts->dtb;
     else {			/* failed utterly */
       sprintf (tmp,"Can't create mailbox %.80s: indeterminate format",mailbox);
-diff -rc alpine-2.24/imap/src/c-client/mail.h alpine-2.24.maildir/imap/src/c-client/mail.h
-*** alpine-2.24/imap/src/c-client/mail.h	2020-10-10 00:24:28.200554500 -0600
---- alpine-2.24.maildir/imap/src/c-client/mail.h	2020-10-10 00:26:49.968167384 -0600
+diff -rc alpine-2.25/imap/src/c-client/mail.h alpine-2.25.maildir/imap/src/c-client/mail.h
+*** alpine-2.25/imap/src/c-client/mail.h	2021-09-18 09:02:36.366783422 -0600
+--- alpine-2.25.maildir/imap/src/c-client/mail.h	2021-09-18 09:03:10.603019770 -0600
 ***************
-*** 383,388 ****
---- 383,392 ----
+*** 389,394 ****
+--- 389,398 ----
   #define SET_SCANCONTENTS (long) 573
   #define GET_MHALLOWINBOX (long) 574
   #define SET_MHALLOWINBOX (long) 575
@@ -96,9 +96,9 @@ diff -rc alpine-2.24/imap/src/c-client/mail.h alpine-2.24.maildir/imap/src/c-cli
   
   /* Driver flags */
   
-diff -rc alpine-2.24/imap/src/osdep/unix/dummy.c alpine-2.24.maildir/imap/src/osdep/unix/dummy.c
-*** alpine-2.24/imap/src/osdep/unix/dummy.c	2020-10-10 00:24:28.192554297 -0600
---- alpine-2.24.maildir/imap/src/osdep/unix/dummy.c	2020-10-10 00:26:49.972167485 -0600
+diff -rc alpine-2.25/imap/src/osdep/unix/dummy.c alpine-2.25.maildir/imap/src/osdep/unix/dummy.c
+*** alpine-2.25/imap/src/osdep/unix/dummy.c	2021-09-18 09:02:36.374783478 -0600
+--- alpine-2.25.maildir/imap/src/osdep/unix/dummy.c	2021-09-18 09:03:10.603019770 -0600
 ***************
 *** 104,116 ****
    * Accepts: mailbox name
@@ -180,7 +180,7 @@ diff -rc alpine-2.24/imap/src/osdep/unix/dummy.c alpine-2.24.maildir/imap/src/os
 +      return maildir_delete(stream, tmp);
 +   }
     if (!(s = dummy_file (tmp,mailbox))) {
-      sprintf (tmp,"Can't delete - invalid name: %.80s",s);
+      sprintf (tmp,"Can't delete - invalid name: %.80s",mailbox);
       MM_LOG (tmp,ERROR);
 ***************
 *** 543,554 ****
@@ -253,9 +253,9 @@ diff -rc alpine-2.24/imap/src/osdep/unix/dummy.c alpine-2.24.maildir/imap/src/os
     return T;			/* return success */
   }
   
-diff -rc alpine-2.24/imap/src/osdep/unix/maildir.c alpine-2.24.maildir/imap/src/osdep/unix/maildir.c
-*** alpine-2.24/imap/src/osdep/unix/maildir.c	2020-10-10 00:26:50.012168504 -0600
---- alpine-2.24.maildir/imap/src/osdep/unix/maildir.c	2020-10-10 00:26:49.972167485 -0600
+diff -rc alpine-2.25/imap/src/osdep/unix/maildir.c alpine-2.25.maildir/imap/src/osdep/unix/maildir.c
+*** alpine-2.25/imap/src/osdep/unix/maildir.c	2021-09-18 09:03:10.715020543 -0600
+--- alpine-2.25.maildir/imap/src/osdep/unix/maildir.c	2021-09-18 09:03:10.607019798 -0600
 ***************
 *** 0 ****
 --- 1,2671 ----
@@ -2930,9 +2930,9 @@ diff -rc alpine-2.24/imap/src/osdep/unix/maildir.c alpine-2.24.maildir/imap/src/
 +       LOCAL->uidtempfile = cpystr(tmp);
 +   }
 + }
-diff -rc alpine-2.24/imap/src/osdep/unix/maildir.h alpine-2.24.maildir/imap/src/osdep/unix/maildir.h
-*** alpine-2.24/imap/src/osdep/unix/maildir.h	2020-10-10 00:26:50.012168504 -0600
---- alpine-2.24.maildir/imap/src/osdep/unix/maildir.h	2020-10-10 00:26:49.972167485 -0600
+diff -rc alpine-2.25/imap/src/osdep/unix/maildir.h alpine-2.25.maildir/imap/src/osdep/unix/maildir.h
+*** alpine-2.25/imap/src/osdep/unix/maildir.h	2021-09-18 09:03:10.715020543 -0600
+--- alpine-2.25.maildir/imap/src/osdep/unix/maildir.h	2021-09-18 09:03:10.607019798 -0600
 ***************
 *** 0 ****
 --- 1,226 ----
@@ -3162,9 +3162,9 @@ diff -rc alpine-2.24/imap/src/osdep/unix/maildir.h alpine-2.24.maildir/imap/src/
 + void maildir_assign_uid(MAILSTREAM *stream, unsigned long msgno, unsigned long uid);
 + void maildir_uid_renew_tempfile(MAILSTREAM *stream);
 + 
-diff -rc alpine-2.24/imap/src/osdep/unix/Makefile alpine-2.24.maildir/imap/src/osdep/unix/Makefile
-*** alpine-2.24/imap/src/osdep/unix/Makefile	2020-10-10 00:24:28.196554399 -0600
---- alpine-2.24.maildir/imap/src/osdep/unix/Makefile	2020-10-10 00:26:49.976167588 -0600
+diff -rc alpine-2.25/imap/src/osdep/unix/Makefile alpine-2.25.maildir/imap/src/osdep/unix/Makefile
+*** alpine-2.25/imap/src/osdep/unix/Makefile	2021-09-18 09:02:36.374783478 -0600
+--- alpine-2.25.maildir/imap/src/osdep/unix/Makefile	2021-09-18 09:03:10.607019798 -0600
 ***************
 *** 146,152 ****
   # However, mh needs to be before any sysinbox formats (such as mmdf or unix)
@@ -3226,9 +3226,9 @@ diff -rc alpine-2.24/imap/src/osdep/unix/Makefile alpine-2.24.maildir/imap/src/o
   
   # OS-dependent
   
-diff -rc alpine-2.24/imap/src/osdep/unix/os_cyg.h alpine-2.24.maildir/imap/src/osdep/unix/os_cyg.h
-*** alpine-2.24/imap/src/osdep/unix/os_cyg.h	2020-10-10 00:24:28.192554297 -0600
---- alpine-2.24.maildir/imap/src/osdep/unix/os_cyg.h	2020-10-10 00:26:49.976167588 -0600
+diff -rc alpine-2.25/imap/src/osdep/unix/os_cyg.h alpine-2.25.maildir/imap/src/osdep/unix/os_cyg.h
+*** alpine-2.25/imap/src/osdep/unix/os_cyg.h	2021-09-18 09:02:36.374783478 -0600
+--- alpine-2.25.maildir/imap/src/osdep/unix/os_cyg.h	2021-09-18 09:03:10.655020130 -0600
 ***************
 *** 47,52 ****
 --- 47,53 ----
@@ -3239,12 +3239,12 @@ diff -rc alpine-2.24/imap/src/osdep/unix/os_cyg.h alpine-2.24.maildir/imap/src/o
   #define geteuid Geteuid
   uid_t Geteuid (void);
   
-diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
-*** alpine-2.24/pith/conf.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.maildir/pith/conf.c	2020-10-10 00:26:49.976167588 -0600
+diff -rc alpine-2.25/pith/conf.c alpine-2.25.maildir/pith/conf.c
+*** alpine-2.25/pith/conf.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/conf.c	2021-09-18 09:03:10.663020184 -0600
 ***************
-*** 453,458 ****
---- 453,461 ----
+*** 455,460 ****
+--- 455,463 ----
   
   CONF_TXT_T cf_text_newsrc_path[] =		"Full path and name of NEWSRC file";
   
@@ -3255,8 +3255,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
   /*----------------------------------------------------------------------
   These are the variables that control a number of pine functions.  They
 ***************
-*** 657,662 ****
---- 660,669 ----
+*** 659,664 ****
+--- 662,671 ----
   	NULL,			cf_text_news_active},
   {"news-spool-directory",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
   	NULL,			cf_text_news_spooldir},
@@ -3268,8 +3268,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
   	NULL,			cf_text_upload_cmd},
   {"upload-command-prefix",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
 ***************
-*** 2392,2397 ****
---- 2399,2410 ----
+*** 2396,2401 ****
+--- 2403,2414 ----
         mail_parameters(NULL, SET_NEWSSPOOL,
   		      (void *)VAR_NEWS_SPOOL_DIR);
   
@@ -3283,8 +3283,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
       set_current_val(&vars[V_DEFAULT_SAVE_FOLDER], TRUE, TRUE);
       if(!VAR_DEFAULT_SAVE_FOLDER || !VAR_DEFAULT_SAVE_FOLDER[0])
 ***************
-*** 3030,3035 ****
---- 3043,3052 ----
+*** 3035,3040 ****
+--- 3048,3057 ----
   	 F_SORT_DEFAULT_SAVE_ALPHA, h_config_sort_save_alpha, PREF_FLDR, 0},
   	{"vertical-folder-list", "Use Vertical Folder List",
   	 F_VERTICAL_FOLDER_LIST, h_config_vertical_list, PREF_FLDR, 0},
@@ -3296,7 +3296,7 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
   /* Addr book */
   	{"combined-addrbook-display", "Combined Address Book Display",
 ***************
-*** 7209,7215 ****
+*** 7216,7222 ****
   	       int just_flip_value, EditWhich ew)
   {
       char      **vp, *p, **lval, ***alval;
@@ -3304,7 +3304,7 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
       char       *err;
       long	l;
   
---- 7226,7232 ----
+--- 7233,7239 ----
   	       int just_flip_value, EditWhich ew)
   {
       char      **vp, *p, **lval, ***alval;
@@ -3313,8 +3313,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
       long	l;
   
 ***************
-*** 7262,7267 ****
---- 7279,7291 ----
+*** 7269,7274 ****
+--- 7286,7298 ----
   
   	break;
   
@@ -3329,8 +3329,8 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
         case F_DATES_TO_LOCAL :
   	clear_index_cache(ps->mail_stream, 0);
 ***************
-*** 8062,8067 ****
---- 8086,8095 ----
+*** 8071,8076 ****
+--- 8095,8104 ----
   	return(h_config_newmailwidth);
         case V_NEWSRC_PATH :
   	return(h_config_newsrc_path);
@@ -3341,12 +3341,12 @@ diff -rc alpine-2.24/pith/conf.c alpine-2.24.maildir/pith/conf.c
         case V_BROWSER :
   	return(h_config_browser);
         case V_HISTORY :
-diff -rc alpine-2.24/pith/conf.h alpine-2.24.maildir/pith/conf.h
-*** alpine-2.24/pith/conf.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.maildir/pith/conf.h	2020-10-10 00:26:49.976167588 -0600
+diff -rc alpine-2.25/pith/conf.h alpine-2.25.maildir/pith/conf.h
+*** alpine-2.25/pith/conf.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/conf.h	2021-09-18 09:03:10.663020184 -0600
 ***************
-*** 264,269 ****
---- 264,273 ----
+*** 265,270 ****
+--- 265,274 ----
   #define GLO_NEWS_ACTIVE_PATH	     vars[V_NEWS_ACTIVE_PATH].global_val.p
   #define VAR_NEWS_SPOOL_DIR	     vars[V_NEWS_SPOOL_DIR].current_val.p
   #define GLO_NEWS_SPOOL_DIR	     vars[V_NEWS_SPOOL_DIR].global_val.p
@@ -3357,9 +3357,9 @@ diff -rc alpine-2.24/pith/conf.h alpine-2.24.maildir/pith/conf.h
   #define VAR_DISABLE_DRIVERS	     vars[V_DISABLE_DRIVERS].current_val.l
   #define VAR_DISABLE_AUTHS	     vars[V_DISABLE_AUTHS].current_val.l
   #define VAR_REMOTE_ABOOK_METADATA    vars[V_REMOTE_ABOOK_METADATA].current_val.p
-diff -rc alpine-2.24/pith/conftype.h alpine-2.24.maildir/pith/conftype.h
-*** alpine-2.24/pith/conftype.h	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.maildir/pith/conftype.h	2020-10-10 00:26:49.980167690 -0600
+diff -rc alpine-2.25/pith/conftype.h alpine-2.25.maildir/pith/conftype.h
+*** alpine-2.25/pith/conftype.h	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/conftype.h	2021-09-18 09:03:10.667020211 -0600
 ***************
 *** 118,123 ****
 --- 118,126 ----
@@ -3373,8 +3373,8 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.maildir/pith/conftype.h
   		, V_UPLOAD_CMD_PREFIX
   		, V_DOWNLOAD_CMD
 ***************
-*** 406,411 ****
---- 409,417 ----
+*** 408,413 ****
+--- 411,419 ----
   	F_PASS_C1_CONTROL_CHARS,
   	F_SINGLE_FOLDER_LIST,
   	F_VERTICAL_FOLDER_LIST,
@@ -3384,9 +3384,9 @@ diff -rc alpine-2.24/pith/conftype.h alpine-2.24.maildir/pith/conftype.h
   	F_TAB_CHK_RECENT,
   	F_AUTO_REPLY_TO,
   	F_VERBOSE_POST,
-diff -rc alpine-2.24/pith/init.c alpine-2.24.maildir/pith/init.c
-*** alpine-2.24/pith/init.c	2020-10-10 00:24:28.208554703 -0600
---- alpine-2.24.maildir/pith/init.c	2020-10-10 00:26:49.980167690 -0600
+diff -rc alpine-2.25/pith/init.c alpine-2.25.maildir/pith/init.c
+*** alpine-2.25/pith/init.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/init.c	2021-09-18 09:03:10.671020240 -0600
 ***************
 *** 408,413 ****
 --- 408,416 ----
@@ -3399,9 +3399,9 @@ diff -rc alpine-2.24/pith/init.c alpine-2.24.maildir/pith/init.c
              && strcmp(filename, folder_base)){
   #endif
   #endif
-diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
-*** alpine-2.24/pith/pattern.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.maildir/pith/pattern.c	2020-10-10 00:26:49.984167792 -0600
+diff -rc alpine-2.25/pith/pattern.c alpine-2.25.maildir/pith/pattern.c
+*** alpine-2.25/pith/pattern.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/pattern.c	2021-09-18 09:03:10.675020267 -0600
 ***************
 *** 49,55 ****
   #include "../pith/icache.h"
@@ -3422,8 +3422,8 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
   /*
    * Internal prototypes
 ***************
-*** 5485,5490 ****
---- 5487,5501 ----
+*** 5488,5493 ****
+--- 5490,5504 ----
   		break;
   	      
   	      case '#':
@@ -3440,7 +3440,7 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
   		  match++;
   
 ***************
-*** 7905,7911 ****
+*** 7908,7914 ****
       int           we_cancel = 0, width;
       CONTEXT_S	 *save_context = NULL;
       char	  buf[MAX_SCREEN_COLS+1], sbuf[MAX_SCREEN_COLS+1];
@@ -3448,7 +3448,7 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
   #define	FILTMSG_MAX	30
   
       if(!stream)
---- 7916,7922 ----
+--- 7919,7925 ----
       int           we_cancel = 0, width;
       CONTEXT_S	 *save_context = NULL;
       char	  buf[MAX_SCREEN_COLS+1], sbuf[MAX_SCREEN_COLS+1];
@@ -3457,8 +3457,8 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
   
       if(!stream)
 ***************
-*** 7939,7944 ****
---- 7950,7965 ----
+*** 7942,7947 ****
+--- 7953,7968 ----
       if(F_OFF(F_QUELL_FILTER_MSGS, ps_global))
         we_cancel = busy_cue(buf, NULL, 0);
   
@@ -3476,8 +3476,8 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
          && !(save_context = default_save_context(ps_global->context_list)))
         save_context = ps_global->context_list;
 ***************
-*** 8002,8007 ****
---- 8023,8033 ----
+*** 8005,8010 ****
+--- 8026,8036 ----
       if(we_cancel)
         cancel_busy_cue(buf[0] ? 0 : -1);
   
@@ -3489,12 +3489,12 @@ diff -rc alpine-2.24/pith/pattern.c alpine-2.24.maildir/pith/pattern.c
       return(buf[0] != '\0');
   }
   
-diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.maildir/pith/pine.hlp
-*** alpine-2.24/pith/pine.hlp	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.maildir/pith/pine.hlp	2020-10-10 00:26:49.996168098 -0600
+diff -rc alpine-2.25/pith/pine.hlp alpine-2.25.maildir/pith/pine.hlp
+*** alpine-2.25/pith/pine.hlp	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/pine.hlp	2021-09-18 09:03:10.691020378 -0600
 ***************
-*** 23452,23457 ****
---- 23452,23553 ----
+*** 23639,23644 ****
+--- 23639,23740 ----
   &lt;End of help on this topic&gt;
   </BODY>
   </HTML>
@@ -3598,8 +3598,8 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.maildir/pith/pine.hlp
   <HTML>
   <HEAD>
 ***************
-*** 31683,31688 ****
---- 31779,31827 ----
+*** 31861,31866 ****
+--- 31957,32005 ----
   <P>
   &lt;End of help on this topic&gt;
   </BODY>
@@ -3649,9 +3649,9 @@ diff -rc alpine-2.24/pith/pine.hlp alpine-2.24.maildir/pith/pine.hlp
   </HTML>
   ====== h_config_verbose_post =====
   <HTML>
-diff -rc alpine-2.24/pith/send.c alpine-2.24.maildir/pith/send.c
-*** alpine-2.24/pith/send.c	2020-10-10 00:24:28.204554602 -0600
---- alpine-2.24.maildir/pith/send.c	2020-10-10 00:26:49.996168098 -0600
+diff -rc alpine-2.25/pith/send.c alpine-2.25.maildir/pith/send.c
+*** alpine-2.25/pith/send.c	2021-09-18 09:02:36.390783589 -0600
+--- alpine-2.25.maildir/pith/send.c	2021-09-18 09:03:10.695020405 -0600
 ***************
 *** 47,52 ****
 --- 47,55 ----
@@ -3680,9 +3680,9 @@ diff -rc alpine-2.24/pith/send.c alpine-2.24.maildir/pith/send.c
   	if(!(IS_REMOTE(tmp) || is_absolute_path(tmp))){
   	    /*
   	     * The mbox is relative to the home directory.
-diff -rc alpine-2.24/README.maildir alpine-2.24.maildir/README.maildir
-*** alpine-2.24/README.maildir	2020-10-10 00:26:50.012168504 -0600
---- alpine-2.24.maildir/README.maildir	2020-10-10 00:26:49.996168098 -0600
+diff -rc alpine-2.25/README.maildir alpine-2.25.maildir/README.maildir
+*** alpine-2.25/README.maildir	2021-09-18 09:03:10.719020571 -0600
+--- alpine-2.25.maildir/README.maildir	2021-09-18 09:03:10.695020405 -0600
 ***************
 *** 0 ****
 --- 1,149 ----
diff --git a/chappa-rules.patch b/chappa-rules.patch
index e93ffcb..ea46b3d 100644
--- a/chappa-rules.patch
+++ b/chappa-rules.patch
@@ -27,7 +27,7 @@
  pith/mailindx.h           |    3 
  pith/makefile.wnt         |    5 
  pith/pine.hlp             | 1150 +++++++++++++++++++++++++++++++++
- pith/reply.c              |  277 +++++++-
+ pith/reply.c              |  279 +++++++-
  pith/rules.c              | 1565 ++++++++++++++++++++++++++++++++++++++++++++++
  pith/rules.h              |  154 ++++
  pith/rulestype.h          |   94 ++
@@ -39,13 +39,13 @@
  pith/state.h              |   11 
  pith/string.c             |   58 +
  pith/string.h             |    2 
- 40 files changed, 4487 insertions(+), 297 deletions(-)
+ 40 files changed, 4488 insertions(+), 298 deletions(-)
 
-Index: alpine-2.24/alpine/adrbkcmd.c
+Index: alpine-2.25/alpine/adrbkcmd.c
 ===================================================================
---- alpine-2.24.orig/alpine/adrbkcmd.c
-+++ alpine-2.24/alpine/adrbkcmd.c
-@@ -4128,6 +4128,8 @@ ab_compose_internal(BuildTo bldto, int a
+--- alpine-2.25.orig/alpine/adrbkcmd.c
++++ alpine-2.25/alpine/adrbkcmd.c
+@@ -4129,6 +4129,8 @@ ab_compose_internal(BuildTo bldto, int a
  	 * won't do anything, but will cause compose_mail to think there's
  	 * already a role so that it won't try to confirm the default.
  	 */
@@ -54,7 +54,7 @@ Index: alpine-2.24/alpine/adrbkcmd.c
  	if(role)
  	  role = copy_action(role);
  	else{
-@@ -4135,6 +4137,7 @@ ab_compose_internal(BuildTo bldto, int a
+@@ -4136,6 +4138,7 @@ ab_compose_internal(BuildTo bldto, int a
  	    memset((void *)role, 0, sizeof(*role));
  	    role->nick = cpystr("Default Role");
  	}
@@ -62,11 +62,11 @@ Index: alpine-2.24/alpine/adrbkcmd.c
      }
  
      compose_mail(addr, fcc, role, NULL, NULL);
-Index: alpine-2.24/alpine/alpine.c
+Index: alpine-2.25/alpine/alpine.c
 ===================================================================
---- alpine-2.24.orig/alpine/alpine.c
-+++ alpine-2.24/alpine/alpine.c
-@@ -500,6 +500,7 @@ main(int argc, char **argv)
+--- alpine-2.25.orig/alpine/alpine.c
++++ alpine-2.25/alpine/alpine.c
+@@ -506,6 +506,7 @@ main(int argc, char **argv)
      /* Set up optional for user-defined display filtering */
      pine_state->tools.display_filter	     = dfilter;
      pine_state->tools.display_filter_trigger = dfilter_trigger;
@@ -74,7 +74,7 @@ Index: alpine-2.24/alpine/alpine.c
  
  #ifdef _WINDOWS
      if(ps_global->install_flag){
-@@ -3267,6 +3268,9 @@ goodnight_gracey(struct pine *pine_state
+@@ -3281,6 +3282,9 @@ goodnight_gracey(struct pine *pine_state
      extern KBESC_T *kbesc;
  
      dprint((2, "goodnight_gracey:\n"));    
@@ -84,10 +84,10 @@ Index: alpine-2.24/alpine/alpine.c
  
      /* We want to do this here before we close up the streams */
      trim_remote_adrbks();
-Index: alpine-2.24/alpine/confscroll.c
+Index: alpine-2.25/alpine/confscroll.c
 ===================================================================
---- alpine-2.24.orig/alpine/confscroll.c
-+++ alpine-2.24/alpine/confscroll.c
+--- alpine-2.25.orig/alpine/confscroll.c
++++ alpine-2.25/alpine/confscroll.c
 @@ -52,6 +52,7 @@ static char rcsid[] = "$Id: confscroll.c
  #include "../pith/tempfile.h"
  #include "../pith/pattern.h"
@@ -142,10 +142,10 @@ Index: alpine-2.24/alpine/confscroll.c
      else if(var == &ps->vars[V_INDEX_FORMAT]){
  	reset_index_format();
  	clear_index_cache(ps->mail_stream, 0);
-Index: alpine-2.24/alpine/dispfilt.c
+Index: alpine-2.25/alpine/dispfilt.c
 ===================================================================
---- alpine-2.24.orig/alpine/dispfilt.c
-+++ alpine-2.24/alpine/dispfilt.c
+--- alpine-2.25.orig/alpine/dispfilt.c
++++ alpine-2.25/alpine/dispfilt.c
 @@ -461,3 +461,63 @@ df_valid_test(struct mail_bodystruct *bo
  
      return(passed);
@@ -210,10 +210,10 @@ Index: alpine-2.24/alpine/dispfilt.c
 +
 +    return(status);
 +}
-Index: alpine-2.24/alpine/dispfilt.h
+Index: alpine-2.25/alpine/dispfilt.h
 ===================================================================
---- alpine-2.24.orig/alpine/dispfilt.h
-+++ alpine-2.24/alpine/dispfilt.h
+--- alpine-2.25.orig/alpine/dispfilt.h
++++ alpine-2.25/alpine/dispfilt.h
 @@ -25,7 +25,7 @@ char	*dfilter_trigger(BODY *, char *, si
  char	*expand_filter_tokens(char *, ENVELOPE *, char **, char **, char **, int *, int *, int *);
  char	*filter_session_key(void);
@@ -223,10 +223,10 @@ Index: alpine-2.24/alpine/dispfilt.h
  
  
  #endif /* PINE_DISPFILT_INCLUDED */
-Index: alpine-2.24/alpine/folder.c
+Index: alpine-2.25/alpine/folder.c
 ===================================================================
---- alpine-2.24.orig/alpine/folder.c
-+++ alpine-2.24/alpine/folder.c
+--- alpine-2.25.orig/alpine/folder.c
++++ alpine-2.25/alpine/folder.c
 @@ -248,7 +248,7 @@ folder_screen(struct pine *ps)
      dprint((1, "=== folder_screen called ====\n"));
      mailcap_free(); /* free resources we won't be using for a while */
@@ -244,10 +244,10 @@ Index: alpine-2.24/alpine/folder.c
  }
  
  
-Index: alpine-2.24/alpine/mailcmd.c
+Index: alpine-2.25/alpine/mailcmd.c
 ===================================================================
---- alpine-2.24.orig/alpine/mailcmd.c
-+++ alpine-2.24/alpine/mailcmd.c
+--- alpine-2.25.orig/alpine/mailcmd.c
++++ alpine-2.25/alpine/mailcmd.c
 @@ -73,6 +73,7 @@ static char rcsid[] = "$Id: mailcmd.c 12
  #include "../pith/tempfile.h"
  #include "../pith/search.h"
@@ -256,7 +256,7 @@ Index: alpine-2.24/alpine/mailcmd.c
  #ifdef _WINDOWS
  #include "../pico/osdep/mswin.h"
  #endif
-@@ -2721,6 +2722,9 @@ role_compose(struct pine *state)
+@@ -2722,6 +2723,9 @@ role_compose(struct pine *state)
  		role->nick = cpystr("Default Role");
  	    }
  
@@ -266,13 +266,13 @@ Index: alpine-2.24/alpine/mailcmd.c
  	    state->redrawer = NULL;
  	    switch(action){
  	      case 'c':
-@@ -2771,12 +2775,12 @@ save_prompt(struct pine *state, CONTEXT_
+@@ -2772,12 +2776,12 @@ save_prompt(struct pine *state, CONTEXT_
  	    char *nmsgs, ENVELOPE *env, long int rawmsgno, char *section,
  	    SaveDel *dela, SavePreserveOrder *prea)
  {
 -    int		      rc, ku = -1, n, flags, last_rc = 0, saveable_count = 0, done = 0;
 +    int		      rc, ku = -1, n = 0, flags, last_rc = 0, saveable_count = 0, done = 0;
-     int		      delindex, preindex, r;
+     int		      delindex = 0, preindex = 0, r;
      char	      prompt[6*MAX_SCREEN_COLS+1], *p, expanded[MAILTMPLEN];
      char              *buf = tmp_20k_buf;
      char              shortbuf[200];
@@ -281,7 +281,7 @@ Index: alpine-2.24/alpine/mailcmd.c
      HelpType	      help;
      SaveDel           del = DontAsk;
      SavePreserveOrder pre = DontAskPreserve;
-@@ -2784,6 +2788,7 @@ save_prompt(struct pine *state, CONTEXT_
+@@ -2785,6 +2789,7 @@ save_prompt(struct pine *state, CONTEXT_
      static HISTORY_S *history = NULL;
      CONTEXT_S	     *tc;
      ESCKEY_S	      ekey[10];
@@ -289,11 +289,11 @@ Index: alpine-2.24/alpine/mailcmd.c
  
      if(!cntxt)
        alpine_panic("no context ptr in save_prompt");
-@@ -2793,6 +2798,15 @@ save_prompt(struct pine *state, CONTEXT_
+@@ -2794,6 +2799,15 @@ save_prompt(struct pine *state, CONTEXT_
      if(!(folder = save_get_default(state, env, rawmsgno, section, cntxt)))
        return(0);		/* message expunged! */
  
-+    if (rule = get_result_rule(V_SAVE_RULES, FOR_SAVE, env)){
++    if ((rule = get_result_rule(V_SAVE_RULES, FOR_SAVE, env)) != NULL){
 +       strncpy(folder2,rule->result,sizeof(folder2)-1);
 +       folder2[sizeof(folder2)-1] = '\0';
 +       folder = folder2;
@@ -305,10 +305,10 @@ Index: alpine-2.24/alpine/mailcmd.c
      /* how many context's can be saved to... */
      for(tc = state->context_list; tc; tc = tc->next)
        if(!NEWS_TEST(tc))
-Index: alpine-2.24/alpine/mailindx.c
+Index: alpine-2.25/alpine/mailindx.c
 ===================================================================
---- alpine-2.24.orig/alpine/mailindx.c
-+++ alpine-2.24/alpine/mailindx.c
+--- alpine-2.25.orig/alpine/mailindx.c
++++ alpine-2.25/alpine/mailindx.c
 @@ -229,6 +229,8 @@ mail_index_screen(struct pine *state)
      state->prev_screen = mail_index_screen;
      state->next_screen = SCREEN_FUN_NULL;
@@ -333,10 +333,10 @@ Index: alpine-2.24/alpine/mailindx.c
  }
  
  
-Index: alpine-2.24/alpine/mailpart.c
+Index: alpine-2.25/alpine/mailpart.c
 ===================================================================
---- alpine-2.24.orig/alpine/mailpart.c
-+++ alpine-2.24/alpine/mailpart.c
+--- alpine-2.25.orig/alpine/mailpart.c
++++ alpine-2.25/alpine/mailpart.c
 @@ -182,7 +182,7 @@ attachment_screen(struct pine *ps)
  		  maxnumwid = 0, maxsizewid = 0, old_cols = -1, km_popped = 0, expbits,
  		  last_type = TYPEOTHER;
@@ -370,10 +370,10 @@ Index: alpine-2.24/alpine/mailpart.c
  }
  
  
-Index: alpine-2.24/alpine/mailview.c
+Index: alpine-2.25/alpine/mailview.c
 ===================================================================
---- alpine-2.24.orig/alpine/mailview.c
-+++ alpine-2.24/alpine/mailview.c
+--- alpine-2.25.orig/alpine/mailview.c
++++ alpine-2.25/alpine/mailview.c
 @@ -252,6 +252,8 @@ mail_view_screen(struct pine *ps)
      ps->prev_screen = mail_view_screen;
      ps->force_prefer_plain = ps->force_no_prefer_plain = 0;
@@ -391,10 +391,10 @@ Index: alpine-2.24/alpine/mailview.c
  
      if (prefix && *prefix)
         fs_give((void **)&prefix);
-Index: alpine-2.24/alpine/osdep/termin.gen.c
+Index: alpine-2.25/alpine/osdep/termin.gen.c
 ===================================================================
---- alpine-2.24.orig/alpine/osdep/termin.gen.c
-+++ alpine-2.24/alpine/osdep/termin.gen.c
+--- alpine-2.25.orig/alpine/osdep/termin.gen.c
++++ alpine-2.25/alpine/osdep/termin.gen.c
 @@ -33,6 +33,8 @@ static char rcsid[] = "$Id: termin.gen.c
  #include "../../pith/newmail.h"
  #include "../../pith/conf.h"
@@ -456,7 +456,7 @@ Index: alpine-2.24/alpine/osdep/termin.gen.c
      if(ucs != NO_OP_COMMAND && ucs != NO_OP_IDLE && ucs != KEY_RESIZE)
        zero_new_mail_count();
  
-@@ -1158,6 +1196,7 @@ process_config_input(UCS *ch)
+@@ -1159,6 +1197,7 @@ process_config_input(UCS *ch)
  	if(ps_global->initial_cmds && !*ps_global->initial_cmds && ps_global->free_initial_cmds){
  	    fs_give((void **) &ps_global->free_initial_cmds);
  	    ps_global->initial_cmds = NULL;
@@ -464,10 +464,10 @@ Index: alpine-2.24/alpine/osdep/termin.gen.c
  	}
  
  	return(ret);
-Index: alpine-2.24/alpine/reply.c
+Index: alpine-2.25/alpine/reply.c
 ===================================================================
---- alpine-2.24.orig/alpine/reply.c
-+++ alpine-2.24/alpine/reply.c
+--- alpine-2.25.orig/alpine/reply.c
++++ alpine-2.25/alpine/reply.c
 @@ -62,7 +62,8 @@ The evolution continues...
  #include "../pith/tempfile.h"
  #include "../pith/busy.h"
@@ -478,7 +478,7 @@ Index: alpine-2.24/alpine/reply.c
  
  /*
   * Internal Prototypes
-@@ -110,11 +111,12 @@ reply(struct pine *pine_state, ACTION_S
+@@ -109,11 +110,12 @@ reply(struct pine *pine_state, ACTION_S
      long        msgno, j, totalm, rflags, *seq = NULL;
      int         i, include_text = 0, times = -1, warned = 0, rv = 0,
  		flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
@@ -492,7 +492,7 @@ Index: alpine-2.24/alpine/reply.c
  #if	defined(DOS) && !defined(_WINDOWS)
      char *reserve;
  #endif
-@@ -140,6 +142,69 @@ reply(struct pine *pine_state, ACTION_S
+@@ -139,6 +141,69 @@ reply(struct pine *pine_state, ACTION_S
         && F_ON(F_ENABLE_FULL_HDR_AND_TEXT, ps_global))
        reply_raw_body = 1;
  
@@ -514,7 +514,7 @@ Index: alpine-2.24/alpine/reply.c
 +		goto done_early;
 +	    }
 +
-+	    if(rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE , env)){
++	    if((rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE , env)) != NULL){
 +	        RULELIST *list = get_rulelist_from_code(V_REPLY_INDENT_RULES,
 +                                                ps_global->rule_list);
 +	        RULE_S *prule = get_rule(list, rule->number);
@@ -562,7 +562,7 @@ Index: alpine-2.24/alpine/reply.c
      /*
       * We may have to loop through first to figure out what default
       * reply-indent-string to offer...
-@@ -288,8 +353,18 @@ reply(struct pine *pine_state, ACTION_S
+@@ -287,8 +352,18 @@ reply(struct pine *pine_state, ACTION_S
  		outgoing->subject = cpystr("Re: several messages");
  	    }
  	}
@@ -583,7 +583,7 @@ Index: alpine-2.24/alpine/reply.c
      }
  
      /* fill reply header */
-@@ -308,13 +383,7 @@ reply(struct pine *pine_state, ACTION_S
+@@ -307,13 +382,7 @@ reply(struct pine *pine_state, ACTION_S
      if(sp_expunge_count(pine_state->mail_stream))	/* cur msg expunged */
        goto done_early;
  
@@ -598,7 +598,7 @@ Index: alpine-2.24/alpine/reply.c
  	rflags = ROLE_REPLY;
  	if(!ps_global->reply.role_chosen && nonempty_patterns(rflags, &dummy)){
  	    /* setup default role */
-@@ -725,6 +794,9 @@ reply(struct pine *pine_state, ACTION_S
+@@ -724,6 +793,9 @@ reply(struct pine *pine_state, ACTION_S
      if(prefix)
        fs_give((void **)&prefix);
  
@@ -608,7 +608,7 @@ Index: alpine-2.24/alpine/reply.c
      if(fcc)
        fs_give((void **) &fcc);
  
-@@ -1598,9 +1670,14 @@ forward(struct pine *ps, ACTION_S *role_
+@@ -1594,9 +1666,14 @@ forward(struct pine *ps, ACTION_S *role_
  	}
      }
  
@@ -624,7 +624,7 @@ Index: alpine-2.24/alpine/reply.c
  
      outgoing->message_id  = generate_message_id(role);
  
-@@ -1834,6 +1911,7 @@ forward(struct pine *ps, ACTION_S *role_
+@@ -1830,6 +1907,7 @@ forward(struct pine *ps, ACTION_S *role_
  #if	defined(DOS) && !defined(_WINDOWS)
      free((void *)reserve);
  #endif
@@ -632,10 +632,10 @@ Index: alpine-2.24/alpine/reply.c
      pine_send(outgoing, &body, "FORWARD MESSAGE",
  	      role, NULL, &reply, redraft_pos,
  	      NULL, NULL, 0);
-Index: alpine-2.24/alpine/roleconf.c
+Index: alpine-2.25/alpine/roleconf.c
 ===================================================================
---- alpine-2.24.orig/alpine/roleconf.c
-+++ alpine-2.24/alpine/roleconf.c
+--- alpine-2.25.orig/alpine/roleconf.c
++++ alpine-2.25/alpine/roleconf.c
 @@ -7706,6 +7706,11 @@ role_text_tool_inick(struct pine *ps, in
  	    if(apval)
  	      *apval = (role && role->nick) ? cpystr(role->nick) : NULL;
@@ -648,10 +648,10 @@ Index: alpine-2.24/alpine/roleconf.c
  	    if((*cl)->value)
  	      fs_give((void **)&((*cl)->value));
  
-Index: alpine-2.24/alpine/send.c
+Index: alpine-2.25/alpine/send.c
 ===================================================================
---- alpine-2.24.orig/alpine/send.c
-+++ alpine-2.24/alpine/send.c
+--- alpine-2.25.orig/alpine/send.c
++++ alpine-2.25/alpine/send.c
 @@ -63,7 +63,7 @@ static char rcsid[] = "$Id: send.c 1142
  #include "../pith/mimetype.h"
  #include "../pith/send.h"
@@ -720,7 +720,7 @@ Index: alpine-2.24/alpine/send.c
 +			    (void)removing_extra_stuff(addr);
 +			    if (rule->result)
 +				fs_give((void **)&rule->result);
-+				fs_give((void **)&rule);
++			    fs_give((void **)&rule);
 +			}
 +			fs_give((void **)&ps_global->procid);
 +			if (outgoing->date)
@@ -730,10 +730,10 @@ Index: alpine-2.24/alpine/send.c
  		    rfc822_parse_adrlist(pf->addr, addr,
  					 ps_global->maildomain);
  		    fs_give((void **)&addr);
-Index: alpine-2.24/pith/Makefile.am
+Index: alpine-2.25/pith/Makefile.am
 ===================================================================
---- alpine-2.24.orig/pith/Makefile.am
-+++ alpine-2.24/pith/Makefile.am
+--- alpine-2.25.orig/pith/Makefile.am
++++ alpine-2.25/pith/Makefile.am
 @@ -26,7 +26,7 @@ libpith_a_SOURCES = ablookup.c abdlc.c a
  	filter.c flag.c folder.c handle.c help.c helpindx.c hist.c icache.c ical.c imap.c init.c \
  	keyword.c ldap.c list.c mailcap.c mailcmd.c mailindx.c maillist.c mailview.c \
@@ -743,10 +743,10 @@ Index: alpine-2.24/pith/Makefile.am
  	state.c status.c store.c stream.c string.c strlst.c takeaddr.c tempfile.c text.c \
  	thread.c adjtime.c url.c util.c helptext.c smkeys.c smime.c
  
-Index: alpine-2.24/pith/Makefile.in
+Index: alpine-2.25/pith/Makefile.in
 ===================================================================
---- alpine-2.24.orig/pith/Makefile.in
-+++ alpine-2.24/pith/Makefile.in
+--- alpine-2.25.orig/pith/Makefile.in
++++ alpine-2.25/pith/Makefile.in
 @@ -142,7 +142,7 @@ am_libpith_a_OBJECTS = ablookup.$(OBJEXT
  	mimedesc.$(OBJEXT) mimetype.$(OBJEXT) msgno.$(OBJEXT) \
  	newmail.$(OBJEXT) news.$(OBJEXT) pattern.$(OBJEXT) \
@@ -773,10 +773,10 @@ Index: alpine-2.24/pith/Makefile.in
  
  .c.o:
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-Index: alpine-2.24/pith/adrbklib.c
+Index: alpine-2.25/pith/adrbklib.c
 ===================================================================
---- alpine-2.24.orig/pith/adrbklib.c
-+++ alpine-2.24/pith/adrbklib.c
+--- alpine-2.25.orig/pith/adrbklib.c
++++ alpine-2.25/pith/adrbklib.c
 @@ -5138,8 +5138,14 @@ init_addrbooks(OpenStatus want_status, i
  	    if(as.cur >= as.how_many_personals)
  	      pab->type |= GLOBAL;
@@ -794,10 +794,10 @@ Index: alpine-2.24/pith/adrbklib.c
  	    /* global address books are forced readonly */
  	    if(pab->type & GLOBAL && pab->access != NoAccess)
  	      pab->access = ReadOnly;
-Index: alpine-2.24/pith/conf.c
+Index: alpine-2.25/pith/conf.c
 ===================================================================
---- alpine-2.24.orig/pith/conf.c
-+++ alpine-2.24/pith/conf.c
+--- alpine-2.25.orig/pith/conf.c
++++ alpine-2.25/pith/conf.c
 @@ -29,6 +29,7 @@ static char rcsid[] = "$Id: conf.c 1266
  #include "../pith/remote.h"
  #include "../pith/keyword.h"
@@ -843,7 +843,7 @@ Index: alpine-2.24/pith/conf.c
  CONF_TXT_T cf_text_speller[] =		"Specifies the program invoked by ^T in the Composer.";
  
  #ifdef _WINDOWS
-@@ -574,6 +605,34 @@ static struct variable variables[] = {
+@@ -576,6 +607,34 @@ static struct variable variables[] = {
  	NULL,			cf_text_thread_exp_char},
  {"threading-lastreply-character",	0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
  	"Threading Last Reply Character",	cf_text_thread_lastreply_char},
@@ -878,7 +878,7 @@ Index: alpine-2.24/pith/conf.c
  #ifndef	_WINDOWS
  {"display-character-set",		0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0,
  	NULL,			cf_text_disp_char_set},
-@@ -2772,6 +2831,7 @@ init_vars(struct pine *ps, void (*cmds_f
+@@ -2777,6 +2836,7 @@ init_vars(struct pine *ps, void (*cmds_f
        if(cmds_f)
          (*cmds_f)(ps, VAR_INIT_CMD_LIST);
  
@@ -886,7 +886,7 @@ Index: alpine-2.24/pith/conf.c
  #ifdef	_WINDOWS
      mswin_set_quit_confirm (F_OFF(F_QUIT_WO_CONFIRM, ps_global));
  #endif	/* _WINDOWS */
-@@ -3228,6 +3288,8 @@ feature_list(int index)
+@@ -3233,6 +3293,8 @@ feature_list(int index)
  	 F_FORCE_LOW_SPEED, h_config_force_low_speed, PREF_OS_LWSD, 0},
  	{"auto-move-read-msgs", "Auto Move Read Messages",
  	 F_AUTO_READ_MSGS, h_config_auto_read_msgs, PREF_MISC, 0},
@@ -895,7 +895,7 @@ Index: alpine-2.24/pith/conf.c
  	{"auto-unselect-after-apply", NULL,
  	 F_AUTO_UNSELECT, h_config_auto_unselect, PREF_MISC, 0},
  	{"auto-unzoom-after-apply", NULL,
-@@ -7927,6 +7989,34 @@ config_help(int var, int feature)
+@@ -7934,6 +7996,34 @@ config_help(int var, int feature)
  	return(h_config_ab_sort_rule);
        case V_FLD_SORT_RULE :
  	return(h_config_fld_sort_rule);
@@ -930,11 +930,11 @@ Index: alpine-2.24/pith/conf.c
        case V_POST_CHAR_SET :
  	return(h_config_post_char_set);
        case V_UNK_CHAR_SET :
-Index: alpine-2.24/pith/conf.h
+Index: alpine-2.25/pith/conf.h
 ===================================================================
---- alpine-2.24.orig/pith/conf.h
-+++ alpine-2.24/pith/conf.h
-@@ -161,6 +161,46 @@
+--- alpine-2.25.orig/pith/conf.h
++++ alpine-2.25/pith/conf.h
+@@ -162,6 +162,46 @@
  #define GLO_AB_SORT_RULE	     vars[V_AB_SORT_RULE].global_val.p
  #define VAR_FLD_SORT_RULE	     vars[V_FLD_SORT_RULE].current_val.p
  #define GLO_FLD_SORT_RULE	     vars[V_FLD_SORT_RULE].global_val.p
@@ -981,10 +981,10 @@ Index: alpine-2.24/pith/conf.h
  #ifndef	_WINDOWS
  #define VAR_CHAR_SET		     vars[V_CHAR_SET].current_val.p
  #define GLO_CHAR_SET		     vars[V_CHAR_SET].global_val.p
-Index: alpine-2.24/pith/conftype.h
+Index: alpine-2.25/pith/conftype.h
 ===================================================================
---- alpine-2.24.orig/pith/conftype.h
-+++ alpine-2.24/pith/conftype.h
+--- alpine-2.25.orig/pith/conftype.h
++++ alpine-2.25/pith/conftype.h
 @@ -71,6 +71,20 @@ typedef	enum {    V_PERSONAL_NAME = 0
  		, V_THREAD_MORE_CHAR
  		, V_THREAD_EXP_CHAR
@@ -1006,7 +1006,7 @@ Index: alpine-2.24/pith/conftype.h
  #ifndef	_WINDOWS
  		, V_CHAR_SET
  		, V_OLD_CHAR_SET
-@@ -348,6 +362,7 @@ typedef enum {
+@@ -349,6 +363,7 @@ typedef enum {
  	F_FULL_AUTO_EXPUNGE,
  	F_EXPUNGE_MANUALLY,
  	F_AUTO_READ_MSGS,
@@ -1014,10 +1014,10 @@ Index: alpine-2.24/pith/conftype.h
  	F_AUTO_FCC_ONLY,
  	F_READ_IN_NEWSRC_ORDER,
  	F_SELECT_WO_CONFIRM,
-Index: alpine-2.24/pith/detoken.c
+Index: alpine-2.25/pith/detoken.c
 ===================================================================
---- alpine-2.24.orig/pith/detoken.c
-+++ alpine-2.24/pith/detoken.c
+--- alpine-2.25.orig/pith/detoken.c
++++ alpine-2.25/pith/detoken.c
 @@ -25,7 +25,7 @@ static char rcsid[] = "$Id: detoken.c 76
  #include "../pith/reply.h"
  #include "../pith/mailindx.h"
@@ -1079,10 +1079,10 @@ Index: alpine-2.24/pith/detoken.c
  		  repl = get_reply_data(env, role, pt->ctype,
  					subbuf, sizeof(subbuf)-1);
  
-Index: alpine-2.24/pith/indxtype.h
+Index: alpine-2.25/pith/indxtype.h
 ===================================================================
---- alpine-2.24.orig/pith/indxtype.h
-+++ alpine-2.24/pith/indxtype.h
+--- alpine-2.25.orig/pith/indxtype.h
++++ alpine-2.25/pith/indxtype.h
 @@ -84,6 +84,11 @@ typedef enum {iNothing, iStatus, iFStatu
  	      iCurNews, iArrow,
  	      iMailbox, iAddress, iInit, iCursorPos,
@@ -1131,10 +1131,10 @@ Index: alpine-2.24/pith/indxtype.h
  
  #define DEFAULT_REPLY_INTRO "default"
  
-Index: alpine-2.24/pith/mailcmd.c
+Index: alpine-2.25/pith/mailcmd.c
 ===================================================================
---- alpine-2.24.orig/pith/mailcmd.c
-+++ alpine-2.24/pith/mailcmd.c
+--- alpine-2.25.orig/pith/mailcmd.c
++++ alpine-2.25/pith/mailcmd.c
 @@ -39,6 +39,7 @@ static char rcsid[] = "$Id: mailcmd.c 11
  #include "../pith/ablookup.h"
  #include "../pith/search.h"
@@ -1343,7 +1343,7 @@ Index: alpine-2.24/pith/mailcmd.c
  
  	for(; f && *archive; archive++){
  	    char *p;
-@@ -2761,3 +2658,295 @@ get_uname(char *mailbox, char *target, i
+@@ -2760,3 +2657,295 @@ get_uname(char *mailbox, char *target, i
  
      return(*target ? target : NULL);
  }
@@ -1639,10 +1639,10 @@ Index: alpine-2.24/pith/mailcmd.c
 +
 +  }
 +}
-Index: alpine-2.24/pith/mailcmd.h
+Index: alpine-2.25/pith/mailcmd.h
 ===================================================================
---- alpine-2.24.orig/pith/mailcmd.h
-+++ alpine-2.24/pith/mailcmd.h
+--- alpine-2.25.orig/pith/mailcmd.h
++++ alpine-2.25/pith/mailcmd.h
 @@ -42,6 +42,8 @@
  #define DB_FROMTAB	0x02	/* opening because of TAB command      */
  #define DB_INBOXWOCNTXT	0x04	/* interpret inbox as one true inbox */
@@ -1666,10 +1666,10 @@ Index: alpine-2.24/pith/mailcmd.h
  void	   cross_delete_crossposts(MAILSTREAM *);
  long	   zoom_index(struct pine *, MAILSTREAM *, MSGNO_S *, int);
  int	   unzoom_index(struct pine *, MAILSTREAM *, MSGNO_S *);
-Index: alpine-2.24/pith/mailindx.c
+Index: alpine-2.25/pith/mailindx.c
 ===================================================================
---- alpine-2.24.orig/pith/mailindx.c
-+++ alpine-2.24/pith/mailindx.c
+--- alpine-2.25.orig/pith/mailindx.c
++++ alpine-2.25/pith/mailindx.c
 @@ -41,6 +41,7 @@ static char rcsid[] = "$Id: mailindx.c 1
  #include "../pith/send.h"
  #include "../pith/options.h"
@@ -2078,7 +2078,7 @@ Index: alpine-2.24/pith/mailindx.c
 +
 +  rule = get_result_rule(V_THREAD_DISP_STYLE_RULES, FOR_THREAD, NULL);
 +  if (rule || ps_global->VAR_THREAD_DISP_STYLE){
-+     for(i = 0; v = thread_disp_styles(i); i++)
++     for(i = 0; (v = thread_disp_styles(i)) != NULL; i++)
 +        if(!strucmp(rule ? rule->result : ps_global->VAR_THREAD_DISP_STYLE, 
 +		    rule ? (v ? v->name : "" ) : S_OR_L(v))){
 +              ps_global->thread_disp_style = v->value;
@@ -2106,7 +2106,7 @@ Index: alpine-2.24/pith/mailindx.c
 +    fs_give((void **)&env->sparep);
 + if(we_clear)
 +   mail_free_envelope(&env);
-+ if(rule = get_rulelist_from_code(V_REPLACE_RULES, ps_global->rule_list)){
++ if((rule = get_rulelist_from_code(V_REPLACE_RULES, ps_global->rule_list)) != NULL){
 +    list = functions_for_token(token);
 +    while(rule_result == NULL && (prule = get_rule(rule,n++))){
 +        rule_context = 0;
@@ -2129,10 +2129,10 @@ Index: alpine-2.24/pith/mailindx.c
 + }
 + return rule_result;
 +}
-Index: alpine-2.24/pith/mailindx.h
+Index: alpine-2.25/pith/mailindx.h
 ===================================================================
---- alpine-2.24.orig/pith/mailindx.h
-+++ alpine-2.24/pith/mailindx.h
+--- alpine-2.25.orig/pith/mailindx.h
++++ alpine-2.25/pith/mailindx.h
 @@ -30,6 +30,9 @@ extern void		(*setup_header_widths)(MAIL
  
  
@@ -2143,10 +2143,10 @@ Index: alpine-2.24/pith/mailindx.h
  int	       msgline_hidden(MAILSTREAM *, MSGNO_S *, long, int);
  void	       adjust_cur_to_visible(MAILSTREAM *, MSGNO_S *);
  unsigned long  line_hash(char *);
-Index: alpine-2.24/pith/makefile.wnt
+Index: alpine-2.25/pith/makefile.wnt
 ===================================================================
---- alpine-2.24.orig/pith/makefile.wnt
-+++ alpine-2.24/pith/makefile.wnt
+--- alpine-2.25.orig/pith/makefile.wnt
++++ alpine-2.25/pith/makefile.wnt
 @@ -46,7 +46,8 @@ HFILES=	../include/system.h ../include/g
  	init.h keyword.h ldap.h list.h mailcap.h mailcmd.h mailindx.h maillist.h \
  	mailpart.h mailview.h margin.h mimedesc.h mimetype.h msgno.h newmail.h news.h \
@@ -2166,11 +2166,11 @@ Index: alpine-2.24/pith/makefile.wnt
  	smime.obj smkeys.obj sort.obj state.obj status.obj store.obj stream.obj string.obj strlst.obj \
  	takeaddr.obj tempfile.obj text.obj thread.obj adjtime.obj url.obj util.obj
  
-Index: alpine-2.24/pith/pine.hlp
+Index: alpine-2.25/pith/pine.hlp
 ===================================================================
---- alpine-2.24.orig/pith/pine.hlp
-+++ alpine-2.24/pith/pine.hlp
-@@ -4602,6 +4602,7 @@ There are also additional details on
+--- alpine-2.25.orig/pith/pine.hlp
++++ alpine-2.25/pith/pine.hlp
+@@ -4760,6 +4760,7 @@ There are also additional details on
  <li><a href="h_config_alt_reply_menu">FEATURE: <!--#echo var="FEAT_alternate-reply-menu"--></a>
  <li><a href="h_config_force_low_speed">FEATURE: <!--#echo var="FEAT_assume-slow-link"--></a>
  <li><a href="h_config_auto_read_msgs">FEATURE: <!--#echo var="FEAT_auto-move-read-msgs"--></a>
@@ -2178,7 +2178,7 @@ Index: alpine-2.24/pith/pine.hlp
  <li><a href="h_config_auto_open_unread">FEATURE: <!--#echo var="FEAT_auto-open-next-unread"--></a>
  <li><a href="h_config_auto_unselect">FEATURE: <!--#echo var="FEAT_auto-unselect-after-apply"--></a>
  <li><a href="h_config_auto_unzoom">FEATURE: <!--#echo var="FEAT_auto-unzoom-after-apply"--></a>
-@@ -20133,6 +20134,7 @@ This set of special tokens may be used i
+@@ -20292,6 +20293,7 @@ This set of special tokens may be used i
  <A HREF="h_config_index_format">&quot;<!--#echo var="VAR_index-format"-->&quot;</A> option,
  in the <A HREF="h_config_reply_intro">&quot;<!--#echo var="VAR_reply-leadin"-->&quot;</A> option,
  in signature files,
@@ -2186,7 +2186,7 @@ Index: alpine-2.24/pith/pine.hlp
  in template files used in
  <A HREF="h_rules_roles">&quot;roles&quot;</A>, and in the folder name
  that is the target of a Filter Rule.
-@@ -20145,7 +20147,7 @@ and in the target of Filter Rules.
+@@ -20304,7 +20306,7 @@ and in the target of Filter Rules.
  <P>
  <P>
  
@@ -2195,7 +2195,7 @@ Index: alpine-2.24/pith/pine.hlp
  
  <DL>
  <DT>SUBJECT</DT>
-@@ -20179,6 +20181,22 @@ email address, never the personal name.
+@@ -20338,6 +20340,22 @@ email address, never the personal name.
  For example, &quot;mailbox@domain&quot;.
  </DD>
  
@@ -2218,7 +2218,7 @@ Index: alpine-2.24/pith/pine.hlp
  <DT>MAILBOX</DT>
  <DD>
  This is the same as the &quot;ADDRESS&quot; except that the 
-@@ -20226,6 +20244,15 @@ are unavailable) of the persons specifie
+@@ -20385,6 +20403,15 @@ are unavailable) of the persons specifie
  message's &quot;Cc:&quot; header field.
  </DD>
  
@@ -2234,7 +2234,7 @@ Index: alpine-2.24/pith/pine.hlp
  <DT>RECIPS</DT>
  <DD>
  This token represents the personal names (or email addresses if the names
-@@ -20234,6 +20261,14 @@ message's &quot;To:&quot; header field a
+@@ -20393,6 +20420,14 @@ message's &quot;To:&quot; header field a
  the message's &quot;Cc:&quot; header field.
  </DD>
  
@@ -2249,7 +2249,7 @@ Index: alpine-2.24/pith/pine.hlp
  <DT>NEWSANDRECIPS</DT>
  <DD>
  This token represents the newsgroups from the
-@@ -21366,6 +21401,110 @@ This is an end of line marker.
+@@ -21525,6 +21560,110 @@ This is an end of line marker.
  </DL>
  
  <P>
@@ -2360,7 +2360,7 @@ Index: alpine-2.24/pith/pine.hlp
  <H1><EM>Token Available Only for Templates and Signatures</EM></H1>
  
  <DL>
-@@ -24828,6 +24967,922 @@ character sets Alpine knows about by usi
+@@ -25015,6 +25154,922 @@ character sets Alpine knows about by usi
  &lt;End of help on this topic&gt;
  </BODY>
  </HTML>
@@ -3283,7 +3283,7 @@ Index: alpine-2.24/pith/pine.hlp
  ====== h_config_char_set =====
  <HTML>
  <HEAD>
-@@ -28580,6 +29635,76 @@ the From field is used to show the relat
+@@ -28767,6 +29822,76 @@ the From field is used to show the relat
  &lt;End of help on this topic&gt;
  </BODY>
  </HTML>
@@ -3360,7 +3360,7 @@ Index: alpine-2.24/pith/pine.hlp
  ====== h_config_pruning_rule =====
  <HTML>
  <HEAD>
-@@ -32271,6 +33396,29 @@ automatically transfer all read messages
+@@ -32449,6 +33574,29 @@ automatically transfer all read messages
  them as deleted in the INBOX.  Messages in the INBOX marked with an 
  &quot;N&quot; (meaning New, or unseen) are not affected.
  <P>
@@ -3390,10 +3390,10 @@ Index: alpine-2.24/pith/pine.hlp
  <UL>   
  <LI><A HREF="h_finding_help">Finding more information and requesting help</A>
  </UL><P>
-Index: alpine-2.24/pith/reply.c
+Index: alpine-2.25/pith/reply.c
 ===================================================================
---- alpine-2.24.orig/pith/reply.c
-+++ alpine-2.24/pith/reply.c
+--- alpine-2.25.orig/pith/reply.c
++++ alpine-2.25/pith/reply.c
 @@ -47,6 +47,8 @@ static char rcsid[] = "$Id: reply.c 1074
  #include "../pith/mailcmd.h"
  #include "../pith/margin.h"
@@ -3525,7 +3525,8 @@ Index: alpine-2.24/pith/reply.c
        case iInit:
 +      if (env)  
  	get_addr_data(env, type, buf, maxlen);
- 	break;
+-	break;
++      break;
  
 -      case iRoleNick:
 -	if(role && role->nick){
@@ -3549,7 +3550,7 @@ Index: alpine-2.24/pith/reply.c
 +        {MAILSTREAM *stream = ps_global->mail_stream;
 +	 MSGNO_S *msgmap = NULL;
 +         long msgno;
-+         MESSAGECACHE *mc;
++         MESSAGECACHE *mc = NULL;
 +	 strncpy(buf, "_FLAG_", maxlen);	/* default value */
 +	 if (stream){
 +	     msgmap = sp_msgmap(stream);
@@ -3740,7 +3741,7 @@ Index: alpine-2.24/pith/reply.c
 -	buftmp[sizeof(buftmp)-1] = '\0';
 +    buftmp[0] = '\0';
 +    ps_global->procid = cpystr("fwd-subject");
-+    if (rule = get_result_rule(V_FORWARD_RULES,FOR_COMPOSE, env)){
++    if ((rule = get_result_rule(V_FORWARD_RULES,FOR_COMPOSE, env)) != NULL){
 +       snprintf(buftmp, sizeof(buftmp), "%s", rule->result);
 +       fs_give((void **)&rule->result);
 +       fs_give((void **)&rule);
@@ -3754,10 +3755,10 @@ Index: alpine-2.24/pith/reply.c
  	/* decode any 8bit (copy to the temp buffer if decoding doesn't) */
  	if(rfc1522_decode_to_utf8((unsigned char *) tmp_20k_buf,
  				  SIZEOF_20KBUF, buftmp) == (unsigned char *) buftmp)
-Index: alpine-2.24/pith/rules.c
+Index: alpine-2.25/pith/rules.c
 ===================================================================
 --- /dev/null
-+++ alpine-2.24/pith/rules.c
++++ alpine-2.25/pith/rules.c
 @@ -0,0 +1,1565 @@
 +/* This module was written by
 + *
@@ -4140,11 +4141,11 @@ Index: alpine-2.24/pith/rules.c
 +    d = data;
 +
 +  rvalue = (TOKEN_VALUE *) rule_alloc_mem(sizeof(TOKEN_VALUE));
-+  if (p = advance_to_char(d,';', STRICTLY, &offset)){
++  if ((p = advance_to_char(d,';', STRICTLY, &offset)) != NULL){
 +      rvalue->testxt = p;
 +      rvalue->next   = parse_group_data(d + strlen(p) + 1 + offset, error);
 +  }
-+  else if (p = advance_to_char(d,'}', STRICTLY, NULL))
++  else if ((p = advance_to_char(d,'}', STRICTLY, NULL)) != NULL)
 +      rvalue->testxt = p;
 +  else if (d && *d == '}')
 +      rvalue->testxt = cpystr("");
@@ -4302,7 +4303,7 @@ Index: alpine-2.24/pith/rules.c
 +		   else error++;
 +		   break;
 +	case '|':
-+	case '&': if(*(p+1) = *p){
++	case '&': if((*(p+1) = *p) != '\0'){
 +			strcat(q, CSEP_S); strcat(q, *p == '|' ? "OR " : "AND ");
 +			p += 2;
 +		  } else error++;
@@ -4532,7 +4533,7 @@ Index: alpine-2.24/pith/rules.c
 +{
 +  TOKEN_VALUE *rv;
 +  REXSUB_S *rsv = NULL;		/* rexsub value */
-+  char *d, *p, *t, *n;		/* data, pattern, text, number */
++  char *d = NULL, *p, *t, *n;	/* data, pattern, text, number */
 +  long number;
 +  int offset, error;
 +
@@ -4624,7 +4625,7 @@ Index: alpine-2.24/pith/rules.c
 +  RULELIST *trulelist = NULL;
 +
 +  if (list[i] && *list[i]){
-+     if(rule = parse_rule(list[i], context)){
++     if((rule = parse_rule(list[i], context)) != NULL){
 +	trulelist  = (RULELIST *) rule_alloc_mem(sizeof(RULELIST));
 +	trulelist->prule = rule;
 +	trulelist->next = get_rule_list(list, context, i+1);
@@ -4660,7 +4661,7 @@ Index: alpine-2.24/pith/rules.c
 +  if (list && *list && **list){
 +     trulelist = (PRULELIST_S *) rule_alloc_mem(sizeof(PRULELIST_S));
 +     trulelist->varnum = code;
-+     if (trulelist->rlist = get_rule_list(list, context, 0))
++     if ((trulelist->rlist = get_rule_list(list, context, 0)) != NULL)
 +        ps_global->rule_list = add_prule(ps_global->rule_list, trulelist);
 +     else
 +	free_parsed_rule_list(&trulelist);
@@ -4737,7 +4738,7 @@ Index: alpine-2.24/pith/rules.c
 +  if(!rlist)
 +     return NULL;
 +
-+  if (result = process_rule(rlist->prule, ctxt, env))
++  if ((result = process_rule(rlist->prule, ctxt, env)) != NULL)
 +      return result;
 +  else{
 +       (*n)++;
@@ -5075,7 +5076,7 @@ Index: alpine-2.24/pith/rules.c
 +   if (!tval)
 +      return test;
 +
-+   while(begin_text = strstr(test+offset,tval->testxt)){
++   while((begin_text = strstr(test+offset,tval->testxt)) != NULL){
 +      memmove(begin_text, begin_text+strlen(tval->testxt), strlen(begin_text) - strlen(tval->testxt) + 1);
 +      offset = begin_text - test;
 +   }
@@ -5091,7 +5092,7 @@ Index: alpine-2.24/pith/rules.c
 + int offset;
 +
 + if (taction->context & context){
-+    if (test = detoken_src(taction->token, context, env, NULL, NULL, NULL))
++    if ((test = detoken_src(taction->token, context, env, NULL, NULL, NULL)) != NULL)
 +       test = do_trim(test, taction->value);
 +    return test;
 + }
@@ -5109,7 +5110,7 @@ Index: alpine-2.24/pith/rules.c
 +      return test;
 +
 +   if((trim_text = expand(test, tval->testxt)) != NULL){
-+      while(begin_text = strstr(test+offset, trim_text)){
++      while((begin_text = strstr(test+offset, trim_text)) != NULL){
 +          memmove(begin_text, begin_text+strlen(trim_text), strlen(begin_text) - strlen(trim_text) + 1);
 +          offset = begin_text - test;
 +      }
@@ -5324,10 +5325,10 @@ Index: alpine-2.24/pith/rules.c
 +  env = pine_mail_fetchenvelope(idata->stream, idata->rawno);
 +  return env;
 +}
-Index: alpine-2.24/pith/rules.h
+Index: alpine-2.25/pith/rules.h
 ===================================================================
 --- /dev/null
-+++ alpine-2.24/pith/rules.h
++++ alpine-2.25/pith/rules.h
 @@ -0,0 +1,154 @@
 +/* Included file rules.h */
 +
@@ -5483,10 +5484,10 @@ Index: alpine-2.24/pith/rules.h
 +#define RELAXED 0x2
 +
 +#endif 	/* PITH_RULES_INCLUDED */
-Index: alpine-2.24/pith/rulestype.h
+Index: alpine-2.25/pith/rulestype.h
 ===================================================================
 --- /dev/null
-+++ alpine-2.24/pith/rulestype.h
++++ alpine-2.25/pith/rulestype.h
 @@ -0,0 +1,94 @@
 +#ifndef PITH_RULESTYPE_INCLUDED
 +#define PITH_RULESTYPE_INCLUDED
@@ -5582,10 +5583,10 @@ Index: alpine-2.24/pith/rulestype.h
 +
 +
 +#endif	/* PITH_RULESTYPE_INCLUDED */
-Index: alpine-2.24/pith/save.c
+Index: alpine-2.25/pith/save.c
 ===================================================================
---- alpine-2.24.orig/pith/save.c
-+++ alpine-2.24/pith/save.c
+--- alpine-2.25.orig/pith/save.c
++++ alpine-2.25/pith/save.c
 @@ -955,7 +955,7 @@ save(struct pine *state, MAILSTREAM *str
  	      *date = '\0';
  
@@ -5595,10 +5596,10 @@ Index: alpine-2.24/pith/save.c
  				   mc ? mc->rfc822_size : 0L, flags, date, so);
  
  	    if(flags)
-Index: alpine-2.24/pith/send.c
+Index: alpine-2.25/pith/send.c
 ===================================================================
---- alpine-2.24.orig/pith/send.c
-+++ alpine-2.24/pith/send.c
+--- alpine-2.25.orig/pith/send.c
++++ alpine-2.25/pith/send.c
 @@ -44,6 +44,7 @@ static char rcsid[] = "$Id: send.c 1204
  #include "../pith/ablookup.h"
  #include "../pith/sort.h"
@@ -5681,10 +5682,10 @@ Index: alpine-2.24/pith/send.c
      }
      else if((postcmd = smtp_command(ps_global->c_client_error, sizeof(ps_global->c_client_error))) != NULL){
  	char *cmdlist[2];
-Index: alpine-2.24/pith/sort.c
+Index: alpine-2.25/pith/sort.c
 ===================================================================
---- alpine-2.24.orig/pith/sort.c
-+++ alpine-2.24/pith/sort.c
+--- alpine-2.25.orig/pith/sort.c
++++ alpine-2.25/pith/sort.c
 @@ -30,7 +30,7 @@ static char rcsid[] = "$Id: sort.c 1142
  #include "../pith/signal.h"
  #include "../pith/busy.h"
@@ -5721,7 +5722,7 @@ Index: alpine-2.24/pith/sort.c
  				: pat->action->revsort;
  	}
      }
-+  }
++    }
  
      if(the_sort_order == SortThread && !(flags & SRT_MAN))
        ps_global->thread_cur_sort = ps_global->thread_def_sort;
@@ -5765,10 +5766,10 @@ Index: alpine-2.24/pith/sort.c
 +        return is_rev || rev  ?  SortScore : EndofList;
 +   return EndofList;
 +}
-Index: alpine-2.24/pith/sort.h
+Index: alpine-2.25/pith/sort.h
 ===================================================================
---- alpine-2.24.orig/pith/sort.h
-+++ alpine-2.24/pith/sort.h
+--- alpine-2.25.orig/pith/sort.h
++++ alpine-2.25/pith/sort.h
 @@ -45,6 +45,6 @@ char	*sort_name(SortOrder);
  void	 sort_folder(MAILSTREAM *, MSGNO_S *, SortOrder, int, unsigned, int);
  int	 decode_sort(char *, SortOrder *, int *, int);
@@ -5777,10 +5778,10 @@ Index: alpine-2.24/pith/sort.h
 +SortOrder translate(char *, int);
  
  #endif /* PITH_SORT_INCLUDED */
-Index: alpine-2.24/pith/state.c
+Index: alpine-2.25/pith/state.c
 ===================================================================
---- alpine-2.24.orig/pith/state.c
-+++ alpine-2.24/pith/state.c
+--- alpine-2.25.orig/pith/state.c
++++ alpine-2.25/pith/state.c
 @@ -35,6 +35,7 @@ static char rcsid[] = "$Id: state.c 1074
  #include "../pith/smime.h"
  #include "../pith/ical.h"
@@ -5799,10 +5800,10 @@ Index: alpine-2.24/pith/state.c
      free_vars(*pps);
  
      fs_give((void **) pps);
-Index: alpine-2.24/pith/state.h
+Index: alpine-2.25/pith/state.h
 ===================================================================
---- alpine-2.24.orig/pith/state.h
-+++ alpine-2.24/pith/state.h
+--- alpine-2.25.orig/pith/state.h
++++ alpine-2.25/pith/state.h
 @@ -33,7 +33,7 @@
  #include "../pith/stream.h"
  #include "../pith/color.h"
@@ -5824,7 +5825,7 @@ Index: alpine-2.24/pith/state.h
      unsigned     read_predicted:1;
  
      char         cur_folder[MAXPATH+1];
-@@ -368,6 +373,7 @@ struct pine {
+@@ -369,6 +374,7 @@ struct pine {
      struct {
          char	*(*display_filter)(char *, STORE_S *, gf_io_t, FILTLIST_S *);
          char	*(*display_filter_trigger)(BODY *, char *, size_t);
@@ -5832,7 +5833,7 @@ Index: alpine-2.24/pith/state.h
      } tools;
  
      KEYWORD_S   *keywords;
-@@ -378,6 +384,9 @@ struct pine {
+@@ -379,6 +385,9 @@ struct pine {
      char	 last_error[500];
      INIT_ERR_S  *init_errs;
  
@@ -5842,10 +5843,10 @@ Index: alpine-2.24/pith/state.h
      PRINT_S	*print;
  
  #ifdef SMIME
-Index: alpine-2.24/pith/string.c
+Index: alpine-2.25/pith/string.c
 ===================================================================
---- alpine-2.24.orig/pith/string.c
-+++ alpine-2.24/pith/string.c
+--- alpine-2.25.orig/pith/string.c
++++ alpine-2.25/pith/string.c
 @@ -20,6 +20,7 @@ static char rcsid[] = "$Id: string.c 910
      string.c
      Misc extra and useful string functions
@@ -5872,7 +5873,7 @@ Index: alpine-2.24/pith/string.c
 +
 +    for(;isspace(*p); p++);
 +
-+    while(*string = *p++)
++    while((*string = *p++) != '\0')
 +      if(!isspace((unsigned char)*string)){
 +	only_one_space = 0;
 +	string++;
@@ -5922,10 +5923,10 @@ Index: alpine-2.24/pith/string.c
 +        }
 +}
 +
-Index: alpine-2.24/pith/string.h
+Index: alpine-2.25/pith/string.h
 ===================================================================
---- alpine-2.24.orig/pith/string.h
-+++ alpine-2.24/pith/string.h
+--- alpine-2.25.orig/pith/string.h
++++ alpine-2.25/pith/string.h
 @@ -87,6 +87,7 @@ struct date {
  
  /* exported prototypes */
diff --git a/pico-fix-spurious-undef-warnings.diff b/pico-fix-spurious-undef-warnings.diff
index e3ca9eb..f1e5c07 100644
--- a/pico-fix-spurious-undef-warnings.diff
+++ b/pico-fix-spurious-undef-warnings.diff
@@ -5,11 +5,11 @@
  pico/osdep/shell.c           |    3 +--
  4 files changed, 25 insertions(+), 2 deletions(-)
 
-Index: alpine-2.23/imap/src/c-client/mail.h
+Index: alpine-2.25/imap/src/c-client/mail.h
 ===================================================================
---- alpine-2.23.orig/imap/src/c-client/mail.h
-+++ alpine-2.23/imap/src/c-client/mail.h
-@@ -1921,6 +1921,14 @@ long INWAIT (long seconds);
+--- alpine-2.25.orig/imap/src/c-client/mail.h
++++ alpine-2.25/imap/src/c-client/mail.h
+@@ -1942,6 +1942,14 @@ long INWAIT (long seconds);
  int PSOUT (char *s);
  int PSOUTR (SIZEDTEXT *s);
  int PFLUSH (void);
@@ -24,11 +24,11 @@ Index: alpine-2.23/imap/src/c-client/mail.h
  
  /* XOAUTH2 and AUTHBEARER Client-Side Support */
  
-Index: alpine-2.23/imap/src/osdep/unix/os_slx.h
+Index: alpine-2.25/imap/src/osdep/unix/os_slx.h
 ===================================================================
---- alpine-2.23.orig/imap/src/osdep/unix/os_slx.h
-+++ alpine-2.23/imap/src/osdep/unix/os_slx.h
-@@ -69,3 +69,11 @@ int portable_utime (char *file,time_t ti
+--- alpine-2.25.orig/imap/src/osdep/unix/os_slx.h
++++ alpine-2.25/imap/src/osdep/unix/os_slx.h
+@@ -70,3 +70,11 @@ int portable_utime (char *file,time_t ti
  #include "ftl.h"
  #include "nl.h"
  #include "tcp.h"
@@ -40,10 +40,10 @@ Index: alpine-2.23/imap/src/osdep/unix/os_slx.h
 + */
 +#define if(x) if((x))
 +#define while(x) while((x))
-Index: alpine-2.23/include/system.h
+Index: alpine-2.25/include/system.h
 ===================================================================
---- alpine-2.23.orig/include/system.h
-+++ alpine-2.23/include/system.h
+--- alpine-2.25.orig/include/system.h
++++ alpine-2.25/include/system.h
 @@ -389,4 +389,12 @@ typedef int gid_t;
  # define LOCAL_PASSWD_CACHE
  #endif
@@ -57,15 +57,15 @@ Index: alpine-2.23/include/system.h
 +#define if(x) if((x))
 +#define while(x) while((x))
  #endif /* _SYSTEM_INCLUDED */
-Index: alpine-2.23/pico/osdep/shell.c
+Index: alpine-2.25/pico/osdep/shell.c
 ===================================================================
---- alpine-2.23.orig/pico/osdep/shell.c
-+++ alpine-2.23/pico/osdep/shell.c
+--- alpine-2.25.orig/pico/osdep/shell.c
++++ alpine-2.25/pico/osdep/shell.c
 @@ -98,7 +98,6 @@ bktoshell(int f, int n)
  
      if(gmode&MDSPWN){
  	char *shell;
--	int   dummy;
+-	int   dummy = 1;
  
  	vttidy();
  	movecursor(0, 0);