From ddae94c5fd74bfa58df02a41990aaf944249f809 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Wed, 9 Feb 2022 15:51:21 +0100
Subject: [PATCH] sync confvars with upstream

---
 .config/mutt/confvars | 628 +++++++++++++++++++++++++-----------------
 1 file changed, 368 insertions(+), 260 deletions(-)

diff --git a/.config/mutt/confvars b/.config/mutt/confvars
index 39a91fa..2e0ec1a 100644
--- a/.config/mutt/confvars
+++ b/.config/mutt/confvars
@@ -1,5 +1,5 @@
 # Auto-generated using mkconf from manual.txt
-# on 2021-09-13 12:06:16
+# on 2022-02-09 15:28:20
 #
 # Invoked as: ./mkconf
 #
@@ -1307,6 +1307,8 @@ set editor="mailplate --edit --auto --keep-unknown"
 # This variable controls whether or not attachments on outgoing messages are
 # saved along with the main body of your message.
 # 
+# Note: $fcc_before_send forces the default (set) behavior of this option.
+# 
 set fcc_attach=yes
 
 
@@ -1332,7 +1334,12 @@ set fcc_attach=yes
 # Default: no
 # 
 # When this variable is set, FCCs will be stored unencrypted and unsigned, even
-# when the actual message is encrypted and/or signed. (PGP only)
+# when the actual message is encrypted and/or signed.
+# 
+# Note: $fcc_before_send forces the default (unset) behavior of this option. (PGP
+# only) 
+# 
+# See also $pgp_self_encrypt, $smime_self_encrypt.
 # 
 
 
@@ -1511,12 +1518,16 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 
 # 3.103. forward_decrypt
 # 
-# Type: boolean
+# Type: quadoption
 # Default: yes
 # 
-# Controls the handling of encrypted messages when forwarding a message. When set
-# , the outer layer of encryption is stripped off. This variable is only used if
-# $mime_forward is set and $mime_forward_decode is unset. (PGP only)
+# This quadoption controls the handling of encrypted messages when forwarding or
+# attaching a message. When set to or answered “yes”, the outer layer of
+# encryption is stripped off.
+# 
+# This variable is used if $mime_forward is set and $mime_forward_decode is unset
+# . It is also used when attaching a message via <attach-message> in the compose
+# menu. (PGP only)
 # 
 
 
@@ -2366,7 +2377,17 @@ set include=yes
 # 
 
 
-# 3.160. mail_check
+# 3.160. local_date_header
+# 
+# Type: boolean
+# Default: yes
+# 
+# If set, convert the date in the Date header of sent emails into local
+# (sender's) timezone.
+# 
+
+
+# 3.161. mail_check
 # 
 # Type: number
 # Default: 5
@@ -2376,7 +2397,7 @@ set include=yes
 # 
 
 
-# 3.161. mail_check_recent
+# 3.162. mail_check_recent
 # 
 # Type: boolean
 # Default: yes
@@ -2391,7 +2412,7 @@ set include=yes
 # 
 
 
-# 3.162. mail_check_stats
+# 3.163. mail_check_stats
 # 
 # Type: boolean
 # Default: no
@@ -2408,7 +2429,7 @@ set include=yes
 set mail_check_stats=yes
 
 
-# 3.163. mail_check_stats_interval
+# 3.164. mail_check_stats_interval
 # 
 # Type: number
 # Default: 60
@@ -2418,7 +2439,7 @@ set mail_check_stats=yes
 # 
 
 
-# 3.164. mailcap_path
+# 3.165. mailcap_path
 # 
 # Type: string
 # Default: (empty)
@@ -2430,7 +2451,7 @@ set mail_check_stats=yes
 set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$my_confdir/mailcap.backgrounding:$my_confdir/mailcap.htmldump"
 
 
-# 3.165. mailcap_sanitize
+# 3.166. mailcap_sanitize
 # 
 # Type: boolean
 # Default: yes
@@ -2443,7 +2464,7 @@ set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$
 # 
 
 
-# 3.166. maildir_header_cache_verify
+# 3.167. maildir_header_cache_verify
 # 
 # Type: boolean
 # Default: yes
@@ -2455,7 +2476,7 @@ set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$
 set maildir_header_cache_verify=no
 
 
-# 3.167. maildir_trash
+# 3.168. maildir_trash
 # 
 # Type: boolean
 # Default: no
@@ -2466,7 +2487,7 @@ set maildir_header_cache_verify=no
 # 
 
 
-# 3.168. maildir_check_cur
+# 3.169. maildir_check_cur
 # 
 # Type: boolean
 # Default: no
@@ -2479,7 +2500,7 @@ set maildir_header_cache_verify=no
 # 
 
 
-# 3.169. mark_macro_prefix
+# 3.170. mark_macro_prefix
 # 
 # Type: string
 # Default: “'”
@@ -2490,7 +2511,7 @@ set maildir_header_cache_verify=no
 # 
 
 
-# 3.170. mark_old
+# 3.171. mark_old
 # 
 # Type: boolean
 # Default: yes
@@ -2503,7 +2524,7 @@ set maildir_header_cache_verify=no
 set mark_old=no
 
 
-# 3.171. markers
+# 3.172. markers
 # 
 # Type: boolean
 # Default: yes
@@ -2516,7 +2537,7 @@ set mark_old=no
 set markers=no
 
 
-# 3.172. mask
+# 3.173. mask
 # 
 # Type: regular expression
 # Default: “!^.[^.]”
@@ -2527,7 +2548,7 @@ set markers=no
 # 
 
 
-# 3.173. mbox
+# 3.174. mbox
 # 
 # Type: path
 # Default: “~/mbox”
@@ -2540,7 +2561,7 @@ set markers=no
 set mbox="=spool"
 
 
-# 3.174. mbox_type
+# 3.175. mbox_type
 # 
 # Type: folder magic
 # Default: mbox
@@ -2551,7 +2572,7 @@ set mbox="=spool"
 set mbox_type=Maildir
 
 
-# 3.175. menu_context
+# 3.176. menu_context
 # 
 # Type: number
 # Default: 0
@@ -2562,7 +2583,7 @@ set mbox_type=Maildir
 set menu_context=5
 
 
-# 3.176. menu_move_off
+# 3.177. menu_move_off
 # 
 # Type: boolean
 # Default: yes
@@ -2573,7 +2594,7 @@ set menu_context=5
 # 
 
 
-# 3.177. menu_scroll
+# 3.178. menu_scroll
 # 
 # Type: boolean
 # Default: no
@@ -2586,7 +2607,7 @@ set menu_context=5
 set menu_scroll=yes
 
 
-# 3.178. message_cache_clean
+# 3.179. message_cache_clean
 # 
 # Type: boolean
 # Default: no
@@ -2597,7 +2618,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.179. message_cachedir
+# 3.180. message_cachedir
 # 
 # Type: path
 # Default: (empty)
@@ -2613,7 +2634,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.180. message_format
+# 3.181. message_format
 # 
 # Type: string
 # Default: “%s”
@@ -2624,7 +2645,56 @@ set menu_scroll=yes
 # 
 
 
-# 3.181. meta_key
+# 3.182. message_id_format
+# 
+# Type: string
+# Default: “<%z@%f>”
+# 
+# This variable describes the format of the Message-ID generated when sending
+# messages. Mutt 2.0 introduced a more compact format, but this variable allows
+# the ability to choose your own format. The value may end in “|” to invoke an
+# external filter. See formatstrings-filters.
+# 
+# Please note that the Message-ID value follows a strict syntax, and you are
+# responsible for ensuring correctness if you change this from the default. In
+# particular, the value must follow the syntax in RFC 5322: “"<" id-left "@"
+# id-right ">"”. No spaces are allowed, and id-left should follow the
+# dot-atom-text syntax in the RFC. The id-right should generally be left at %f.
+# 
+# The old Message-ID format can be used by setting this to: “
+# <%Y%02m%02d%02H%02M%02S.G%c%p@%f>” 
+# 
+# The following printf(3)-style sequences are understood:
+# 
+# ┌──┬─────────────────────────────────────────────────────────────────┐ 
+# │%c│step counter looping from “A” to “Z”                             │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%d│current day of the month (GMT)                                   │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%f│$hostname │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%H│current hour using a 24-hour clock (GMT)                         │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%m│current month number (GMT)                                       │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%M│current minute of the hour (GMT)                                 │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%p│pid of the running mutt process                                  │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%r│3 bytes of pseudorandom data encoded in Base64                   │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%S│current second of the minute (GMT)                               │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%x│1 byte of pseudorandom data hex encoded (example: '1b')          │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%Y│current year using 4 digits (GMT)                                │
+# ├──┼─────────────────────────────────────────────────────────────────┤ 
+# │%z│4 byte timestamp + 8 bytes of pseudorandom data encoded in Base64│
+# └──┴─────────────────────────────────────────────────────────────────┘ 
+# 
+
+
+# 3.183. meta_key
 # 
 # Type: boolean
 # Default: no
@@ -2638,7 +2708,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.182. metoo
+# 3.184. metoo
 # 
 # Type: boolean
 # Default: no
@@ -2648,7 +2718,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.183. mh_purge
+# 3.185. mh_purge
 # 
 # Type: boolean
 # Default: no
@@ -2662,7 +2732,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.184. mh_seq_flagged
+# 3.186. mh_seq_flagged
 # 
 # Type: string
 # Default: “flagged”
@@ -2671,7 +2741,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.185. mh_seq_replied
+# 3.187. mh_seq_replied
 # 
 # Type: string
 # Default: “replied”
@@ -2680,7 +2750,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.186. mh_seq_unseen
+# 3.188. mh_seq_unseen
 # 
 # Type: string
 # Default: “unseen”
@@ -2689,7 +2759,7 @@ set menu_scroll=yes
 # 
 
 
-# 3.187. mime_forward
+# 3.189. mime_forward
 # 
 # Type: quadoption
 # Default: no
@@ -2705,7 +2775,7 @@ set menu_scroll=yes
 set mime_forward=ask-yes
 
 
-# 3.188. mime_forward_decode
+# 3.190. mime_forward_decode
 # 
 # Type: boolean
 # Default: no
@@ -2716,7 +2786,7 @@ set mime_forward=ask-yes
 # 
 
 
-# 3.189. mime_forward_rest
+# 3.191. mime_forward_rest
 # 
 # Type: quadoption
 # Default: yes
@@ -2727,7 +2797,7 @@ set mime_forward=ask-yes
 # 
 
 
-# 3.190. mime_type_query_command
+# 3.192. mime_type_query_command
 # 
 # Type: string
 # Default: (empty)
@@ -2748,7 +2818,7 @@ set mime_forward=ask-yes
 # 
 
 
-# 3.191. mime_type_query_first
+# 3.193. mime_type_query_first
 # 
 # Type: boolean
 # Default: no
@@ -2758,7 +2828,7 @@ set mime_forward=ask-yes
 # 
 
 
-# 3.192. mix_entry_format
+# 3.194. mix_entry_format
 # 
 # Type: string
 # Default: “%4n %c %-16s %a”
@@ -2778,7 +2848,7 @@ set mime_forward=ask-yes
 # 
 
 
-# 3.193. mixmaster
+# 3.195. mixmaster
 # 
 # Type: path
 # Default: “mixmaster”
@@ -2790,7 +2860,7 @@ set mime_forward=ask-yes
 set mixmaster="mixmaster-filter"
 
 
-# 3.194. move
+# 3.196. move
 # 
 # Type: quadoption
 # Default: no
@@ -2801,7 +2871,7 @@ set mixmaster="mixmaster-filter"
 set move=no
 
 
-# 3.195. muttlisp_inline_eval
+# 3.197. muttlisp_inline_eval
 # 
 # Type: boolean
 # Default: no
@@ -2811,7 +2881,7 @@ set move=no
 # 
 
 
-# 3.196. narrow_tree
+# 3.198. narrow_tree
 # 
 # Type: boolean
 # Default: no
@@ -2822,7 +2892,7 @@ set move=no
 set narrow_tree=yes
 
 
-# 3.197. net_inc
+# 3.199. net_inc
 # 
 # Type: number
 # Default: 10
@@ -2835,7 +2905,7 @@ set narrow_tree=yes
 # 
 
 
-# 3.198. new_mail_command
+# 3.200. new_mail_command
 # 
 # Type: path
 # Default: (empty)
@@ -2846,7 +2916,7 @@ set narrow_tree=yes
 # 
 
 
-# 3.199. pager
+# 3.201. pager
 # 
 # Type: path
 # Default: “builtin”
@@ -2864,7 +2934,7 @@ set narrow_tree=yes
 # 
 
 
-# 3.200. pager_context
+# 3.202. pager_context
 # 
 # Type: number
 # Default: 0
@@ -2881,7 +2951,7 @@ set narrow_tree=yes
 set pager_context=2
 
 
-# 3.201. pager_format
+# 3.203. pager_format
 # 
 # Type: string
 # Default: “-%Z- %C/%m: %-20.20n   %s%*  -- (%P)”
@@ -2893,7 +2963,7 @@ set pager_context=2
 set pager_format="<%a> %*  %i (%P)"
 
 
-# 3.202. pager_index_lines
+# 3.204. pager_index_lines
 # 
 # Type: number
 # Default: 0
@@ -2912,7 +2982,7 @@ set pager_format="<%a> %*  %i (%P)"
 set pager_index_lines=$menu_context
 
 
-# 3.203. pager_stop
+# 3.205. pager_stop
 # 
 # Type: boolean
 # Default: no
@@ -2923,7 +2993,7 @@ set pager_index_lines=$menu_context
 set pager_stop=yes
 
 
-# 3.204. pattern_format
+# 3.206. pattern_format
 # 
 # Type: string
 # Default: “%2n %-15e  %d”
@@ -2941,7 +3011,7 @@ set pager_stop=yes
 # 
 
 
-# 3.205. pgp_auto_decode
+# 3.207. pgp_auto_decode
 # 
 # Type: boolean
 # Default: no
@@ -2956,7 +3026,7 @@ set pager_stop=yes
 set pgp_auto_decode=yes
 
 
-# 3.206. pgp_autoinline
+# 3.208. pgp_autoinline
 # 
 # Type: boolean
 # Default: no
@@ -2977,7 +3047,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.207. pgp_check_exit
+# 3.209. pgp_check_exit
 # 
 # Type: boolean
 # Default: yes
@@ -2987,7 +3057,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.208. pgp_check_gpg_decrypt_status_fd
+# 3.210. pgp_check_gpg_decrypt_status_fd
 # 
 # Type: boolean
 # Default: yes
@@ -3003,7 +3073,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.209. pgp_clearsign_command
+# 3.211. pgp_clearsign_command
 # 
 # Type: string
 # Default: (empty)
@@ -3016,7 +3086,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.210. pgp_decode_command
+# 3.212. pgp_decode_command
 # 
 # Type: string
 # Default: (empty)
@@ -3047,7 +3117,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.211. pgp_decrypt_command
+# 3.213. pgp_decrypt_command
 # 
 # Type: string
 # Default: (empty)
@@ -3059,7 +3129,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.212. pgp_decryption_okay
+# 3.214. pgp_decryption_okay
 # 
 # Type: regular expression
 # Default: (empty)
@@ -3075,7 +3145,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.213. pgp_default_key
+# 3.215. pgp_default_key
 # 
 # Type: string
 # Default: (empty)
@@ -3090,7 +3160,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.214. pgp_encrypt_only_command
+# 3.216. pgp_encrypt_only_command
 # 
 # Type: string
 # Default: (empty)
@@ -3102,7 +3172,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.215. pgp_encrypt_sign_command
+# 3.217. pgp_encrypt_sign_command
 # 
 # Type: string
 # Default: (empty)
@@ -3114,7 +3184,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.216. pgp_entry_format
+# 3.218. pgp_entry_format
 # 
 # Type: string
 # Default: “%4n %t%f %4l/0x%k %-4a %2c %u”
@@ -3147,7 +3217,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.217. pgp_export_command
+# 3.219. pgp_export_command
 # 
 # Type: string
 # Default: (empty)
@@ -3159,7 +3229,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.218. pgp_getkeys_command
+# 3.220. pgp_getkeys_command
 # 
 # Type: string
 # Default: (empty)
@@ -3172,7 +3242,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.219. pgp_good_sign
+# 3.221. pgp_good_sign
 # 
 # Type: regular expression
 # Default: (empty)
@@ -3184,7 +3254,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.220. pgp_ignore_subkeys
+# 3.222. pgp_ignore_subkeys
 # 
 # Type: boolean
 # Default: yes
@@ -3195,7 +3265,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.221. pgp_import_command
+# 3.223. pgp_import_command
 # 
 # Type: string
 # Default: (empty)
@@ -3208,7 +3278,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.222. pgp_list_pubring_command
+# 3.224. pgp_list_pubring_command
 # 
 # Type: string
 # Default: (empty)
@@ -3231,7 +3301,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.223. pgp_list_secring_command
+# 3.225. pgp_list_secring_command
 # 
 # Type: string
 # Default: (empty)
@@ -3254,7 +3324,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.224. pgp_long_ids
+# 3.226. pgp_long_ids
 # 
 # Type: boolean
 # Default: yes
@@ -3266,7 +3336,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.225. pgp_mime_auto
+# 3.227. pgp_mime_auto
 # 
 # Type: quadoption
 # Default: ask-yes
@@ -3280,7 +3350,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.226. pgp_replyinline
+# 3.228. pgp_replyinline
 # 
 # Type: boolean
 # Default: no
@@ -3303,7 +3373,7 @@ set pgp_auto_decode=yes
 # 
 
 
-# 3.227. pgp_retainable_sigs
+# 3.229. pgp_retainable_sigs
 # 
 # Type: boolean
 # Default: no
@@ -3318,7 +3388,7 @@ set pgp_auto_decode=yes
 set pgp_retainable_sigs=yes
 
 
-# 3.228. pgp_self_encrypt
+# 3.230. pgp_self_encrypt
 # 
 # Type: boolean
 # Default: yes
@@ -3328,7 +3398,7 @@ set pgp_retainable_sigs=yes
 # 
 
 
-# 3.229. pgp_show_unusable
+# 3.231. pgp_show_unusable
 # 
 # Type: boolean
 # Default: yes
@@ -3340,7 +3410,7 @@ set pgp_retainable_sigs=yes
 set pgp_show_unusable=no
 
 
-# 3.230. pgp_sign_as
+# 3.232. pgp_sign_as
 # 
 # Type: string
 # Default: (empty)
@@ -3353,7 +3423,7 @@ set pgp_show_unusable=no
 set pgp_sign_as="0x9C9D6979AE941637"
 
 
-# 3.231. pgp_sign_command
+# 3.233. pgp_sign_command
 # 
 # Type: string
 # Default: (empty)
@@ -3366,7 +3436,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
-# 3.232. pgp_sort_keys
+# 3.234. pgp_sort_keys
 # 
 # Type: sort order
 # Default: address
@@ -3389,7 +3459,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
-# 3.233. pgp_strict_enc
+# 3.235. pgp_strict_enc
 # 
 # Type: boolean
 # Default: yes
@@ -3401,7 +3471,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
-# 3.234. pgp_timeout
+# 3.236. pgp_timeout
 # 
 # Type: number (long)
 # Default: 300
@@ -3411,7 +3481,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
-# 3.235. pgp_use_gpg_agent
+# 3.237. pgp_use_gpg_agent
 # 
 # Type: boolean
 # Default: yes
@@ -3434,7 +3504,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 set pgp_use_gpg_agent=yes
 
 
-# 3.236. pgp_verify_command
+# 3.238. pgp_verify_command
 # 
 # Type: string
 # Default: (empty)
@@ -3446,7 +3516,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.237. pgp_verify_key_command
+# 3.239. pgp_verify_key_command
 # 
 # Type: string
 # Default: (empty)
@@ -3458,7 +3528,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.238. pipe_decode
+# 3.240. pipe_decode
 # 
 # Type: boolean
 # Default: no
@@ -3472,7 +3542,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.239. pipe_decode_weed
+# 3.241. pipe_decode_weed
 # 
 # Type: boolean
 # Default: yes
@@ -3482,7 +3552,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.240. pipe_sep
+# 3.242. pipe_sep
 # 
 # Type: string
 # Default: “n”
@@ -3492,7 +3562,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.241. pipe_split
+# 3.243. pipe_split
 # 
 # Type: boolean
 # Default: no
@@ -3505,7 +3575,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.242. pop_auth_try_all
+# 3.244. pop_auth_try_all
 # 
 # Type: boolean
 # Default: yes
@@ -3517,7 +3587,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.243. pop_authenticators
+# 3.245. pop_authenticators
 # 
 # Type: string
 # Default: (empty)
@@ -3535,7 +3605,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.244. pop_checkinterval
+# 3.246. pop_checkinterval
 # 
 # Type: number
 # Default: 60
@@ -3545,7 +3615,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.245. pop_delete
+# 3.247. pop_delete
 # 
 # Type: quadoption
 # Default: ask-no
@@ -3556,7 +3626,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.246. pop_host
+# 3.248. pop_host
 # 
 # Type: string
 # Default: (empty)
@@ -3570,7 +3640,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.247. pop_last
+# 3.249. pop_last
 # 
 # Type: boolean
 # Default: no
@@ -3581,7 +3651,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.248. pop_oauth_refresh_command
+# 3.250. pop_oauth_refresh_command
 # 
 # Type: string
 # Default: (empty)
@@ -3593,7 +3663,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.249. pop_pass
+# 3.251. pop_pass
 # 
 # Type: string
 # Default: (empty)
@@ -3607,7 +3677,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.250. pop_reconnect
+# 3.252. pop_reconnect
 # 
 # Type: quadoption
 # Default: ask-yes
@@ -3617,7 +3687,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.251. pop_user
+# 3.253. pop_user
 # 
 # Type: string
 # Default: (empty)
@@ -3628,7 +3698,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.252. post_indent_string
+# 3.254. post_indent_string
 # 
 # Type: string
 # Default: (empty)
@@ -3639,7 +3709,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.253. postpone
+# 3.255. postpone
 # 
 # Type: quadoption
 # Default: ask-yes
@@ -3651,7 +3721,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
-# 3.254. postponed
+# 3.256. postponed
 # 
 # Type: path
 # Default: “~/postponed”
@@ -3665,7 +3735,7 @@ set pgp_use_gpg_agent=yes
 set postponed="=drafts"
 
 
-# 3.255. postpone_encrypt
+# 3.257. postpone_encrypt
 # 
 # Type: boolean
 # Default: no
@@ -3677,7 +3747,7 @@ set postponed="=drafts"
 # 
 
 
-# 3.256. postpone_encrypt_as
+# 3.258. postpone_encrypt_as
 # 
 # Type: string
 # Default: (empty)
@@ -3687,7 +3757,7 @@ set postponed="=drafts"
 # 
 
 
-# 3.257. preconnect
+# 3.259. preconnect
 # 
 # Type: string
 # Default: (empty)
@@ -3706,7 +3776,7 @@ set postponed="=drafts"
 # 
 
 
-# 3.258. print
+# 3.260. print
 # 
 # Type: quadoption
 # Default: ask-no
@@ -3716,7 +3786,7 @@ set postponed="=drafts"
 # 
 
 
-# 3.259. print_command
+# 3.261. print_command
 # 
 # Type: path
 # Default: “lpr”
@@ -3726,7 +3796,7 @@ set postponed="=drafts"
 set print_command="muttprint"
 
 
-# 3.260. print_decode
+# 3.262. print_decode
 # 
 # Type: boolean
 # Default: yes
@@ -3743,7 +3813,7 @@ set print_command="muttprint"
 # 
 
 
-# 3.261. print_decode_weed
+# 3.263. print_decode_weed
 # 
 # Type: boolean
 # Default: yes
@@ -3753,7 +3823,7 @@ set print_command="muttprint"
 # 
 
 
-# 3.262. print_split
+# 3.264. print_split
 # 
 # Type: boolean
 # Default: no
@@ -3770,7 +3840,7 @@ set print_command="muttprint"
 set print_split=yes
 
 
-# 3.263. prompt_after
+# 3.265. prompt_after
 # 
 # Type: boolean
 # Default: yes
@@ -3781,7 +3851,7 @@ set print_split=yes
 # 
 
 
-# 3.264. query_command
+# 3.266. query_command
 # 
 # Type: path
 # Default: (empty)
@@ -3796,7 +3866,7 @@ set print_split=yes
 set query_command="lbdbq"
 
 
-# 3.265. query_format
+# 3.267. query_format
 # 
 # Type: string
 # Default: “%4c %t %-25.25a %-25.25n %?e?(%e)?”
@@ -3828,7 +3898,7 @@ set query_command="lbdbq"
 # 
 
 
-# 3.266. quit
+# 3.268. quit
 # 
 # Type: quadoption
 # Default: yes
@@ -3840,7 +3910,7 @@ set query_command="lbdbq"
 # 
 
 
-# 3.267. quote_regexp
+# 3.269. quote_regexp
 # 
 # Type: regular expression
 # Default: “^([ t]*[|>:}#])+”
@@ -3859,7 +3929,7 @@ set query_command="lbdbq"
 # 
 
 
-# 3.268. read_inc
+# 3.270. read_inc
 # 
 # Type: number
 # Default: 10
@@ -3878,7 +3948,7 @@ set query_command="lbdbq"
 # 
 
 
-# 3.269. read_only
+# 3.271. read_only
 # 
 # Type: boolean
 # Default: no
@@ -3887,7 +3957,7 @@ set query_command="lbdbq"
 # 
 
 
-# 3.270. realname
+# 3.272. realname
 # 
 # Type: string
 # Default: (empty)
@@ -3900,7 +3970,7 @@ set query_command="lbdbq"
 # 
 
 
-# 3.271. recall
+# 3.273. recall
 # 
 # Type: quadoption
 # Default: ask-yes
@@ -3917,7 +3987,7 @@ set query_command="lbdbq"
 set recall=no
 
 
-# 3.272. record
+# 3.274. record
 # 
 # Type: path
 # Default: “~/sent”
@@ -3936,7 +4006,7 @@ set recall=no
 set record="=store"
 
 
-# 3.273. reflow_space_quotes
+# 3.275. reflow_space_quotes
 # 
 # Type: boolean
 # Default: yes
@@ -3950,7 +4020,7 @@ set record="=store"
 # 
 
 
-# 3.274. reflow_text
+# 3.276. reflow_text
 # 
 # Type: boolean
 # Default: yes
@@ -3963,7 +4033,7 @@ set record="=store"
 # 
 
 
-# 3.275. reflow_wrap
+# 3.277. reflow_wrap
 # 
 # Type: number
 # Default: 78
@@ -3979,7 +4049,7 @@ set record="=store"
 set reflow_wrap=-10
 
 
-# 3.276. reply_regexp
+# 3.278. reply_regexp
 # 
 # Type: regular expression
 # Default: “^(re([[0-9]+])*|aw):[ t]*”
@@ -3991,7 +4061,7 @@ set reflow_wrap=-10
 set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:space:]]*)+"
 
 
-# 3.277. reply_self
+# 3.279. reply_self
 # 
 # Type: boolean
 # Default: no
@@ -4003,7 +4073,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 # 
 
 
-# 3.278. reply_to
+# 3.280. reply_to
 # 
 # Type: quadoption
 # Default: ask-yes
@@ -4016,7 +4086,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 # 
 
 
-# 3.279. resolve
+# 3.281. resolve
 # 
 # Type: boolean
 # Default: yes
@@ -4027,7 +4097,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 # 
 
 
-# 3.280. resume_draft_files
+# 3.282. resume_draft_files
 # 
 # Type: boolean
 # Default: no
@@ -4039,7 +4109,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 # 
 
 
-# 3.281. resume_edited_draft_files
+# 3.283. resume_edited_draft_files
 # 
 # Type: boolean
 # Default: yes
@@ -4056,7 +4126,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 # 
 
 
-# 3.282. reverse_alias
+# 3.284. reverse_alias
 # 
 # Type: boolean
 # Default: no
@@ -4077,7 +4147,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 # 
 
 
-# 3.283. reverse_name
+# 3.285. reverse_name
 # 
 # Type: boolean
 # Default: no
@@ -4095,7 +4165,7 @@ set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:
 set reverse_name=yes
 
 
-# 3.284. reverse_realname
+# 3.286. reverse_realname
 # 
 # Type: boolean
 # Default: yes
@@ -4113,7 +4183,7 @@ set reverse_name=yes
 # 
 
 
-# 3.285. rfc2047_parameters
+# 3.287. rfc2047_parameters
 # 
 # Type: boolean
 # Default: no
@@ -4137,7 +4207,7 @@ set reverse_name=yes
 set rfc2047_parameters=yes
 
 
-# 3.286. save_address
+# 3.288. save_address
 # 
 # Type: boolean
 # Default: no
@@ -4148,7 +4218,7 @@ set rfc2047_parameters=yes
 # 
 
 
-# 3.287. save_empty
+# 3.289. save_empty
 # 
 # Type: boolean
 # Default: yes
@@ -4162,7 +4232,7 @@ set rfc2047_parameters=yes
 # 
 
 
-# 3.288. save_history
+# 3.290. save_history
 # 
 # Type: number
 # Default: 0
@@ -4173,7 +4243,7 @@ set rfc2047_parameters=yes
 set save_history=100
 
 
-# 3.289. save_name
+# 3.291. save_name
 # 
 # Type: boolean
 # Default: no
@@ -4189,7 +4259,7 @@ set save_history=100
 # 
 
 
-# 3.290. score
+# 3.292. score
 # 
 # Type: boolean
 # Default: yes
@@ -4200,7 +4270,7 @@ set save_history=100
 # 
 
 
-# 3.291. score_threshold_delete
+# 3.293. score_threshold_delete
 # 
 # Type: number
 # Default: -1
@@ -4212,7 +4282,7 @@ set save_history=100
 # 
 
 
-# 3.292. score_threshold_flag
+# 3.294. score_threshold_flag
 # 
 # Type: number
 # Default: 9999
@@ -4222,7 +4292,7 @@ set save_history=100
 # 
 
 
-# 3.293. score_threshold_read
+# 3.295. score_threshold_read
 # 
 # Type: number
 # Default: -1
@@ -4234,7 +4304,7 @@ set save_history=100
 # 
 
 
-# 3.294. search_context
+# 3.296. search_context
 # 
 # Type: number
 # Default: 0
@@ -4245,7 +4315,7 @@ set save_history=100
 set search_context=5
 
 
-# 3.295. send_charset
+# 3.297. send_charset
 # 
 # Type: string
 # Default: “us-ascii:iso-8859-1:utf-8”
@@ -4263,7 +4333,7 @@ set search_context=5
 set send_charset="utf-8"
 
 
-# 3.296. send_multipart_alternative
+# 3.298. send_multipart_alternative
 # 
 # Type: quadoption
 # Default: no
@@ -4278,7 +4348,7 @@ set send_charset="utf-8"
 set send_multipart_alternative=yes
 
 
-# 3.297. send_multipart_alternative_filter
+# 3.299. send_multipart_alternative_filter
 # 
 # Type: path
 # Default: (empty)
@@ -4292,7 +4362,7 @@ set send_multipart_alternative=yes
 set send_multipart_alternative_filter=$my_confdir/markdown2html
 
 
-# 3.298. sendmail
+# 3.300. sendmail
 # 
 # Type: path
 # Default: “/usr/sbin/sendmail -oem -oi”
@@ -4309,7 +4379,7 @@ set send_multipart_alternative_filter=$my_confdir/markdown2html
 set sendmail="$my_confdir/sendmail"
 
 
-# 3.299. sendmail_wait
+# 3.301. sendmail_wait
 # 
 # Type: number
 # Default: 0
@@ -4333,7 +4403,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
-# 3.300. shell
+# 3.302. shell
 # 
 # Type: path
 # Default: (empty)
@@ -4343,7 +4413,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
-# 3.301. sidebar_delim_chars
+# 3.303. sidebar_delim_chars
 # 
 # Type: string
 # Default: “/.”
@@ -4363,7 +4433,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
-# 3.302. sidebar_divider_char
+# 3.304. sidebar_divider_char
 # 
 # Type: string
 # Default: “|”
@@ -4375,7 +4445,7 @@ set sendmail="$my_confdir/sendmail"
 set sidebar_divider_char=" "
 
 
-# 3.303. sidebar_folder_indent
+# 3.305. sidebar_folder_indent
 # 
 # Type: boolean
 # Default: no
@@ -4387,7 +4457,7 @@ set sidebar_divider_char=" "
 set sidebar_folder_indent=yes
 
 
-# 3.304. sidebar_format
+# 3.306. sidebar_format
 # 
 # Type: string
 # Default: “%B%*  %n”
@@ -4431,7 +4501,7 @@ set sidebar_folder_indent=yes
 set sidebar_format="%B%?F? [%F]?%*  %?N?%N/?%S"
 
 
-# 3.305. sidebar_indent_string
+# 3.307. sidebar_indent_string
 # 
 # Type: string
 # Default: “  ”
@@ -4444,7 +4514,7 @@ set sidebar_format="%B%?F? [%F]?%*  %?N?%N/?%S"
 set sidebar_indent_string=" "
 
 
-# 3.306. sidebar_new_mail_only
+# 3.308. sidebar_new_mail_only
 # 
 # Type: boolean
 # Default: no
@@ -4456,7 +4526,7 @@ set sidebar_indent_string=" "
 # 
 
 
-# 3.307. sidebar_next_new_wrap
+# 3.309. sidebar_next_new_wrap
 # 
 # Type: boolean
 # Default: no
@@ -4468,7 +4538,7 @@ set sidebar_indent_string=" "
 set sidebar_next_new_wrap=yes
 
 
-# 3.308. sidebar_relative_shortpath_indent
+# 3.310. sidebar_relative_shortpath_indent
 # 
 # Type: boolean
 # Default: no
@@ -4503,7 +4573,7 @@ set sidebar_next_new_wrap=yes
 # 
 
 
-# 3.309. sidebar_short_path
+# 3.311. sidebar_short_path
 # 
 # Type: boolean
 # Default: no
@@ -4529,10 +4599,10 @@ set sidebar_next_new_wrap=yes
 set sidebar_short_path=yes
 
 
-# 3.310. sidebar_sort_method
+# 3.312. sidebar_sort_method
 # 
 # Type: sort order
-# Default: order
+# Default: unsorted
 # 
 # Specifies how to sort mailbox entries in the sidebar. By default, the entries
 # are sorted alphabetically. Valid values:
@@ -4559,7 +4629,7 @@ set sidebar_short_path=yes
 set sidebar_sort_method=path
 
 
-# 3.311. sidebar_use_mailbox_shortcuts
+# 3.313. sidebar_use_mailbox_shortcuts
 # 
 # Type: boolean
 # Default: no
@@ -4572,7 +4642,7 @@ set sidebar_sort_method=path
 # 
 
 
-# 3.312. sidebar_visible
+# 3.314. sidebar_visible
 # 
 # Type: boolean
 # Default: no
@@ -4585,7 +4655,7 @@ set sidebar_sort_method=path
 set sidebar_visible=no
 
 
-# 3.313. sidebar_width
+# 3.315. sidebar_width
 # 
 # Type: number
 # Default: 30
@@ -4597,7 +4667,7 @@ set sidebar_visible=no
 set sidebar_width=20
 
 
-# 3.314. sig_dashes
+# 3.316. sig_dashes
 # 
 # Type: boolean
 # Default: yes
@@ -4612,7 +4682,7 @@ set sidebar_width=20
 set sig_dashes=no
 
 
-# 3.315. sig_on_top
+# 3.317. sig_on_top
 # 
 # Type: boolean
 # Default: no
@@ -4624,7 +4694,7 @@ set sig_dashes=no
 # 
 
 
-# 3.316. signature
+# 3.318. signature
 # 
 # Type: path
 # Default: “~/.signature”
@@ -4635,7 +4705,7 @@ set sig_dashes=no
 # 
 
 
-# 3.317. simple_search
+# 3.319. simple_search
 # 
 # Type: string
 # Default: “~f %s | ~s %s”
@@ -4652,7 +4722,7 @@ set sig_dashes=no
 set simple_search="~L %s | ~s %s"
 
 
-# 3.318. size_show_bytes
+# 3.320. size_show_bytes
 # 
 # Type: boolean
 # Default: no
@@ -4662,7 +4732,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.319. size_show_fractions
+# 3.321. size_show_fractions
 # 
 # Type: boolean
 # Default: yes
@@ -4672,7 +4742,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.320. size_show_mb
+# 3.322. size_show_mb
 # 
 # Type: boolean
 # Default: yes
@@ -4682,7 +4752,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.321. size_units_on_left
+# 3.323. size_units_on_left
 # 
 # Type: boolean
 # Default: no
@@ -4692,7 +4762,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.322. sleep_time
+# 3.324. sleep_time
 # 
 # Type: number
 # Default: 1
@@ -4704,7 +4774,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.323. smart_wrap
+# 3.325. smart_wrap
 # 
 # Type: boolean
 # Default: yes
@@ -4715,7 +4785,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.324. smileys
+# 3.326. smileys
 # 
 # Type: regular expression
 # Default: “(>From )|(:[-^]?[][)(><}{|/DP])”
@@ -4726,7 +4796,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.325. smime_ask_cert_label
+# 3.327. smime_ask_cert_label
 # 
 # Type: boolean
 # Default: yes
@@ -4737,7 +4807,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.326. smime_ca_location
+# 3.328. smime_ca_location
 # 
 # Type: path
 # Default: (empty)
@@ -4747,7 +4817,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
-# 3.327. smime_certificates
+# 3.329. smime_certificates
 # 
 # Type: path
 # Default: (empty)
@@ -4762,7 +4832,7 @@ set simple_search="~L %s | ~s %s"
 set smime_certificates="~/.smime/certificates"
 
 
-# 3.328. smime_decrypt_command
+# 3.330. smime_decrypt_command
 # 
 # Type: string
 # Default: (empty)
@@ -4798,7 +4868,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.329. smime_decrypt_use_default_key
+# 3.331. smime_decrypt_use_default_key
 # 
 # Type: boolean
 # Default: yes
@@ -4810,7 +4880,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.330. smime_default_key
+# 3.332. smime_default_key
 # 
 # Type: string
 # Default: (empty)
@@ -4830,7 +4900,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.331. smime_encrypt_command
+# 3.333. smime_encrypt_command
 # 
 # Type: string
 # Default: (empty)
@@ -4842,7 +4912,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.332. smime_encrypt_with
+# 3.334. smime_encrypt_with
 # 
 # Type: string
 # Default: “aes256”
@@ -4853,7 +4923,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.333. smime_get_cert_command
+# 3.335. smime_get_cert_command
 # 
 # Type: string
 # Default: (empty)
@@ -4865,7 +4935,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.334. smime_get_cert_email_command
+# 3.336. smime_get_cert_email_command
 # 
 # Type: string
 # Default: (empty)
@@ -4879,7 +4949,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.335. smime_get_signer_cert_command
+# 3.337. smime_get_signer_cert_command
 # 
 # Type: string
 # Default: (empty)
@@ -4893,7 +4963,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.336. smime_import_cert_command
+# 3.338. smime_import_cert_command
 # 
 # Type: string
 # Default: (empty)
@@ -4905,7 +4975,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.337. smime_is_default
+# 3.339. smime_is_default
 # 
 # Type: boolean
 # Default: no
@@ -4918,7 +4988,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
-# 3.338. smime_keys
+# 3.340. smime_keys
 # 
 # Type: path
 # Default: (empty)
@@ -4933,7 +5003,7 @@ set smime_certificates="~/.smime/certificates"
 set smime_keys="~/.smime/keys"
 
 
-# 3.339. smime_pk7out_command
+# 3.341. smime_pk7out_command
 # 
 # Type: string
 # Default: (empty)
@@ -4946,7 +5016,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.340. smime_self_encrypt
+# 3.342. smime_self_encrypt
 # 
 # Type: boolean
 # Default: yes
@@ -4956,7 +5026,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.341. smime_sign_as
+# 3.343. smime_sign_as
 # 
 # Type: string
 # Default: (empty)
@@ -4967,7 +5037,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.342. smime_sign_command
+# 3.344. smime_sign_command
 # 
 # Type: string
 # Default: (empty)
@@ -4981,7 +5051,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.343. smime_sign_digest_alg
+# 3.345. smime_sign_digest_alg
 # 
 # Type: string
 # Default: “sha256”
@@ -4992,7 +5062,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.344. smime_sign_opaque_command
+# 3.346. smime_sign_opaque_command
 # 
 # Type: string
 # Default: (empty)
@@ -5006,7 +5076,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.345. smime_timeout
+# 3.347. smime_timeout
 # 
 # Type: number (long)
 # Default: 300
@@ -5016,7 +5086,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.346. smime_verify_command
+# 3.348. smime_verify_command
 # 
 # Type: string
 # Default: (empty)
@@ -5028,7 +5098,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.347. smime_verify_opaque_command
+# 3.349. smime_verify_opaque_command
 # 
 # Type: string
 # Default: (empty)
@@ -5041,7 +5111,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.348. smtp_authenticators
+# 3.350. smtp_authenticators
 # 
 # Type: string
 # Default: (empty)
@@ -5058,7 +5128,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.349. smtp_oauth_refresh_command
+# 3.351. smtp_oauth_refresh_command
 # 
 # Type: string
 # Default: (empty)
@@ -5070,7 +5140,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.350. smtp_pass
+# 3.352. smtp_pass
 # 
 # Type: string
 # Default: (empty)
@@ -5085,7 +5155,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.351. smtp_url
+# 3.353. smtp_url
 # 
 # Type: string
 # Default: (empty)
@@ -5102,7 +5172,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
-# 3.352. sort
+# 3.354. sort
 # 
 # Type: sort order
 # Default: date
@@ -5135,7 +5205,7 @@ set smime_keys="~/.smime/keys"
 set sort=threads
 
 
-# 3.353. sort_alias
+# 3.355. sort_alias
 # 
 # Type: sort order
 # Default: alias
@@ -5151,7 +5221,7 @@ set sort=threads
 # 
 
 
-# 3.354. sort_aux
+# 3.356. sort_aux
 # 
 # Type: sort order
 # Default: date
@@ -5179,7 +5249,7 @@ set sort=threads
 set sort_aux=last-date-received
 
 
-# 3.355. sort_browser
+# 3.357. sort_browser
 # 
 # Type: sort order
 # Default: alpha
@@ -5204,7 +5274,33 @@ set sort_aux=last-date-received
 # 
 
 
-# 3.356. sort_re
+# 3.358. sort_browser_mailboxes
+# 
+# Type: sort order
+# Default: unsorted
+# 
+# Specifies how to sort entries in the mailbox browser. By default, the entries
+# are unsorted, displayed in the same order as listed in the “mailboxes” command.
+# Valid values:
+# 
+# • alpha (alphabetically)
+# 
+# • count
+# 
+# • date
+# 
+# • size
+# 
+# • unread
+# 
+# • unsorted
+# 
+# You may optionally use the “reverse-” prefix to specify reverse sorting order
+# (example: “set sort_browser_mailboxes=reverse-alpha”).
+# 
+
+
+# 3.359. sort_re
 # 
 # Type: boolean
 # Default: yes
@@ -5219,7 +5315,7 @@ set sort_aux=last-date-received
 # 
 
 
-# 3.357. spam_separator
+# 3.360. spam_separator
 # 
 # Type: string
 # Default: “,”
@@ -5231,7 +5327,7 @@ set sort_aux=last-date-received
 # 
 
 
-# 3.358. spoolfile
+# 3.361. spoolfile
 # 
 # Type: path
 # Default: (empty)
@@ -5244,7 +5340,7 @@ set sort_aux=last-date-received
 set spoolfile="=inbox"
 
 
-# 3.359. ssl_ca_certificates_file
+# 3.362. ssl_ca_certificates_file
 # 
 # Type: path
 # Default: (empty)
@@ -5260,7 +5356,7 @@ set spoolfile="=inbox"
 set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 
 
-# 3.360. ssl_client_cert
+# 3.363. ssl_client_cert
 # 
 # Type: path
 # Default: (empty)
@@ -5269,7 +5365,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.361. ssl_force_tls
+# 3.364. ssl_force_tls
 # 
 # Type: boolean
 # Default: yes
@@ -5281,7 +5377,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.362. ssl_min_dh_prime_bits
+# 3.365. ssl_min_dh_prime_bits
 # 
 # Type: number
 # Default: 0
@@ -5292,7 +5388,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.363. ssl_starttls
+# 3.366. ssl_starttls
 # 
 # Type: quadoption
 # Default: yes
@@ -5307,7 +5403,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.364. ssl_use_sslv2
+# 3.367. ssl_use_sslv2
 # 
 # Type: boolean
 # Default: no
@@ -5318,7 +5414,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.365. ssl_use_sslv3
+# 3.368. ssl_use_sslv3
 # 
 # Type: boolean
 # Default: no
@@ -5329,7 +5425,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.366. ssl_use_tlsv1
+# 3.369. ssl_use_tlsv1
 # 
 # Type: boolean
 # Default: no
@@ -5340,7 +5436,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.367. ssl_use_tlsv1_1
+# 3.370. ssl_use_tlsv1_1
 # 
 # Type: boolean
 # Default: no
@@ -5351,7 +5447,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.368. ssl_use_tlsv1_2
+# 3.371. ssl_use_tlsv1_2
 # 
 # Type: boolean
 # Default: yes
@@ -5360,7 +5456,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.369. ssl_use_tlsv1_3
+# 3.372. ssl_use_tlsv1_3
 # 
 # Type: boolean
 # Default: yes
@@ -5369,7 +5465,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.370. ssl_usesystemcerts
+# 3.373. ssl_usesystemcerts
 # 
 # Type: boolean
 # Default: yes
@@ -5380,7 +5476,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.371. ssl_verify_dates
+# 3.374. ssl_verify_dates
 # 
 # Type: boolean
 # Default: yes
@@ -5391,7 +5487,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.372. ssl_verify_host
+# 3.375. ssl_verify_host
 # 
 # Type: boolean
 # Default: yes
@@ -5402,7 +5498,19 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.373. ssl_verify_partial_chains
+# 3.376. ssl_verify_host_override
+# 
+# Type: string
+# Default: (empty)
+# 
+# Defines an alternate host name to verify the server certificate against. This
+# should not be set unless you are sure what you are doing, but it might be
+# useful for connection to a .onion host without a properly configured host name
+# in the certificate. See $ssl_verify_host.
+# 
+
+
+# 3.377. ssl_verify_partial_chains
 # 
 # Type: boolean
 # Default: no
@@ -5419,7 +5527,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.374. ssl_ciphers
+# 3.378. ssl_ciphers
 # 
 # Type: string
 # Default: (empty)
@@ -5433,7 +5541,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.375. status_chars
+# 3.379. status_chars
 # 
 # Type: string
 # Default: “-*%A”
@@ -5450,7 +5558,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
-# 3.376. status_format
+# 3.380. status_format
 # 
 # Type: string (localized)
 # Default: “-%r-Mutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F?
@@ -5555,7 +5663,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%?t? t:%t?%?p? p:%p?%?b? i:%b?%?l? %l?] %?V?%V ?(%s/%S) %> (%P) "
 
 
-# 3.377. status_on_top
+# 3.381. status_on_top
 # 
 # Type: boolean
 # Default: no
@@ -5566,7 +5674,7 @@ set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%
 # 
 
 
-# 3.378. strict_threads
+# 3.382. strict_threads
 # 
 # Type: boolean
 # Default: no
@@ -5581,7 +5689,7 @@ set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%
 set strict_threads=yes
 
 
-# 3.379. suspend
+# 3.383. suspend
 # 
 # Type: boolean
 # Default: yes
@@ -5592,7 +5700,7 @@ set strict_threads=yes
 # 
 
 
-# 3.380. text_flowed
+# 3.384. text_flowed
 # 
 # Type: boolean
 # Default: no
@@ -5611,13 +5719,13 @@ set strict_threads=yes
 set text_flowed=yes
 
 
-# 3.381. thorough_search
+# 3.385. thorough_search
 # 
 # Type: boolean
 # Default: yes
 # 
-# Affects the ~b and ~h search operations described in section “patterns”. If set
-# , the headers and body/attachments of messages to be searched are decoded
+# Affects the ~b, ~B, and ~h search operations described in section “patterns”.
+# If set, the headers and body/attachments of messages to be searched are decoded
 # before searching. If unset, messages are searched as they appear in the folder.
 # 
 # Users searching attachments or for non-ASCII characters should set this value
@@ -5629,7 +5737,7 @@ set text_flowed=yes
 set thorough_search=yes
 
 
-# 3.382. thread_received
+# 3.386. thread_received
 # 
 # Type: boolean
 # Default: no
@@ -5640,7 +5748,7 @@ set thorough_search=yes
 set thread_received=yes
 
 
-# 3.383. tilde
+# 3.387. tilde
 # 
 # Type: boolean
 # Default: no
@@ -5651,7 +5759,7 @@ set thread_received=yes
 set tilde=yes
 
 
-# 3.384. time_inc
+# 3.388. time_inc
 # 
 # Type: number
 # Default: 0
@@ -5666,7 +5774,7 @@ set tilde=yes
 set time_inc=250
 
 
-# 3.385. timeout
+# 3.389. timeout
 # 
 # Type: number
 # Default: 600
@@ -5683,7 +5791,7 @@ set time_inc=250
 # 
 
 
-# 3.386. tmpdir
+# 3.390. tmpdir
 # 
 # Type: path
 # Default: (empty)
@@ -5695,7 +5803,7 @@ set time_inc=250
 # 
 
 
-# 3.387. to_chars
+# 3.391. to_chars
 # 
 # Type: string
 # Default: “ +TCFL”
@@ -5712,7 +5820,7 @@ set time_inc=250
 # 
 
 
-# 3.388. trash
+# 3.392. trash
 # 
 # Type: path
 # Default: (empty)
@@ -5725,7 +5833,7 @@ set time_inc=250
 # 
 
 
-# 3.389. ts_icon_format
+# 3.393. ts_icon_format
 # 
 # Type: string (localized)
 # Default: “M%?n?AIL&ail?”
@@ -5735,7 +5843,7 @@ set time_inc=250
 # 
 
 
-# 3.390. ts_enabled
+# 3.394. ts_enabled
 # 
 # Type: boolean
 # Default: no
@@ -5746,7 +5854,7 @@ set time_inc=250
 set ts_enabled=yes
 
 
-# 3.391. ts_status_format
+# 3.395. ts_status_format
 # 
 # Type: string (localized)
 # Default: “Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?”
@@ -5758,7 +5866,7 @@ set ts_enabled=yes
 set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 
 
-# 3.392. tunnel
+# 3.396. tunnel
 # 
 # Type: string
 # Default: (empty)
@@ -5778,7 +5886,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
-# 3.393. tunnel_is_secure
+# 3.397. tunnel_is_secure
 # 
 # Type: boolean
 # Default: yes
@@ -5795,7 +5903,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
-# 3.394. uncollapse_jump
+# 3.398. uncollapse_jump
 # 
 # Type: boolean
 # Default: no
@@ -5805,7 +5913,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
-# 3.395. uncollapse_new
+# 3.399. uncollapse_new
 # 
 # Type: boolean
 # Default: yes
@@ -5816,7 +5924,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
-# 3.396. use_8bitmime
+# 3.400. use_8bitmime
 # 
 # Type: boolean
 # Default: no
@@ -5830,7 +5938,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
-# 3.397. use_domain
+# 3.401. use_domain
 # 
 # Type: boolean
 # Default: yes
@@ -5840,7 +5948,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
-# 3.398. use_envelope_from
+# 3.402. use_envelope_from
 # 
 # Type: boolean
 # Default: no
@@ -5857,7 +5965,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 set use_envelope_from=yes
 
 
-# 3.399. use_from
+# 3.403. use_from
 # 
 # Type: boolean
 # Default: yes
@@ -5868,7 +5976,7 @@ set use_envelope_from=yes
 # 
 
 
-# 3.400. use_ipv6
+# 3.404. use_ipv6
 # 
 # Type: boolean
 # Default: yes
@@ -5879,7 +5987,7 @@ set use_envelope_from=yes
 # 
 
 
-# 3.401. user_agent
+# 3.405. user_agent
 # 
 # Type: boolean
 # Default: no
@@ -5889,7 +5997,7 @@ set use_envelope_from=yes
 # 
 
 
-# 3.402. visual
+# 3.406. visual
 # 
 # Type: path
 # Default: (empty)
@@ -5899,7 +6007,7 @@ set use_envelope_from=yes
 # 
 
 
-# 3.403. wait_key
+# 3.407. wait_key
 # 
 # Type: boolean
 # Default: yes
@@ -5918,7 +6026,7 @@ set use_envelope_from=yes
 set wait_key=no
 
 
-# 3.404. weed
+# 3.408. weed
 # 
 # Type: boolean
 # Default: yes
@@ -5930,7 +6038,7 @@ set wait_key=no
 # 
 
 
-# 3.405. wrap
+# 3.409. wrap
 # 
 # Type: number
 # Default: 0
@@ -5945,7 +6053,7 @@ set wait_key=no
 set wrap=$reflow_wrap
 
 
-# 3.406. wrap_headers
+# 3.410. wrap_headers
 # 
 # Type: number
 # Default: 78
@@ -5959,7 +6067,7 @@ set wrap=$reflow_wrap
 # 
 
 
-# 3.407. wrap_search
+# 3.411. wrap_search
 # 
 # Type: boolean
 # Default: yes
@@ -5971,7 +6079,7 @@ set wrap=$reflow_wrap
 # 
 
 
-# 3.408. wrapmargin
+# 3.412. wrapmargin
 # 
 # Type: number
 # Default: 0
@@ -5980,7 +6088,7 @@ set wrap=$reflow_wrap
 # 
 
 
-# 3.409. write_bcc
+# 3.413. write_bcc
 # 
 # Type: boolean
 # Default: no
@@ -6001,7 +6109,7 @@ set wrap=$reflow_wrap
 # 
 
 
-# 3.410. write_inc
+# 3.414. write_inc
 # 
 # Type: number
 # Default: 10
-- 
2.39.2