import new confvars

[etc/neomutt.git] / .config / neomutt / confvars

diff --git a/.config/neomutt/confvars b/.config/neomutt/confvars
index c4b5cc6413d312db4cf3bb83361a12b57beb1007..bf45b88ff59bea03a26eb65bb6077d2fedd5ee89 100644 (file)
--- a/.config/neomutt/confvars
+++ b/.config/neomutt/confvars
@@ -1,5 +1,5 @@
 # Auto-generated using mkconf from manual.txt
 # Auto-generated using mkconf from manual.txt

-# on 2023-08-11 16:33:16
+# on 2024-09-19 21:42:43

 #
 # Invoked as: ./mkconf
 #
 #
 # Invoked as: ./mkconf
 #


@@ -90,7 +90,21 @@ set abort_noattach=ask-yes
 # 
 
 
 # 
 
 

-# 3.7. alias_file
+# 3.7. account_command
+# 
+# Type: command
+# Default: (empty)
+# 
+# If set, this command is used to retrieve account credentials. The command is
+# invoked passing a number of --key value arguments with the specifics of the
+# account to lookup. The command writes to standard output a number of key: value
+# lines. Currently supported arguments are --hostname, --username, and --type,
+# where type can be any of imap, imaps, pop, pops, smtp, smtps, nntp, and nntps.
+# Currently supported output lines are login, username, and password.
+# 
+
+
+# 3.8. alias_file

 # 
 # Type: path
 # Default: “~/.neomuttrc”
 # 
 # Type: path
 # Default: “~/.neomuttrc”


@@ -109,7 +123,7 @@ set abort_noattach=ask-yes
 set alias_file="$my_confdir/aliases"
 
 
 set alias_file="$my_confdir/aliases"
 
 

-# 3.8. alias_format
+# 3.9. alias_format

 # 
 # Type: string
 # Default: “%3n %f%t %-15a %-56r | %c”
 # 
 # Type: string
 # Default: “%3n %f%t %-15a %-56r | %c”


@@ -130,6 +144,8 @@ set alias_file="$my_confdir/aliases"
 # ├───┼───────────────────────────────────────────────────────────────┤ 
 # │%t │Character which indicates if the alias is tagged for inclusion │
 # ├───┼───────────────────────────────────────────────────────────────┤ 
 # ├───┼───────────────────────────────────────────────────────────────┤ 
 # │%t │Character which indicates if the alias is tagged for inclusion │
 # ├───┼───────────────────────────────────────────────────────────────┤ 

+# │%Y │Comma-separated tags                                           │
+# ├───┼───────────────────────────────────────────────────────────────┤ 

 # │%>X│right justify the rest of the string and pad with character "X"│
 # ├───┼───────────────────────────────────────────────────────────────┤ 
 # │%|X│pad to the end of the line with character "X"                  │
 # │%>X│right justify the rest of the string and pad with character "X"│
 # ├───┼───────────────────────────────────────────────────────────────┤ 
 # │%|X│pad to the end of the line with character "X"                  │


@@ -139,7 +155,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.9. allow_8bit
+# 3.10. allow_8bit

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -149,7 +165,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.10. allow_ansi
+# 3.11. allow_ansi

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -167,7 +183,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.11. arrow_cursor
+# 3.12. arrow_cursor

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -179,7 +195,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.12. arrow_string
+# 3.13. arrow_string

 # 
 # Type: string
 # Default: “->”
 # 
 # Type: string
 # Default: “->”


@@ -188,7 +204,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.13. ascii_chars
+# 3.14. ascii_chars

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -198,7 +214,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.14. ask_bcc
+# 3.15. ask_bcc

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -208,7 +224,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.15. ask_cc
+# 3.16. ask_cc

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -218,7 +234,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.16. ask_follow_up
+# 3.17. ask_followup_to

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -228,7 +244,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.17. ask_x_comment_to
+# 3.18. ask_x_comment_to

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -238,9 +254,9 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.18. assumed_charset
+# 3.19. assumed_charset

 # 
 # 

-# Type: string
+# Type: string list

 # Default: (empty)
 # 
 # This variable is a colon-separated list of character encoding schemes for
 # Default: (empty)
 # 
 # This variable is a colon-separated list of character encoding schemes for


@@ -257,9 +273,9 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.19. attach_charset
+# 3.20. attach_charset

 # 
 # 

-# Type: string
+# Type: string list

 # Default: (empty)
 # 
 # This variable is a colon-separated list of character encoding schemes for text
 # Default: (empty)
 # 
 # This variable is a colon-separated list of character encoding schemes for text


@@ -277,10 +293,10 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.20. attach_format
+# 3.21. attach_format

 # 
 # Type: string
 # 
 # Type: string

-# Default: “%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] ”
+# Default: “%u%D%I %t%4n %T%d %> [%.7m/%.10M, %.6e%<C?, %C>, %s] ”

 # 
 # This variable describes the format of the "attachment" menu. The following
 # printf(3)-style sequences are understood:
 # 
 # This variable describes the format of the "attachment" menu. The following
 # printf(3)-style sequences are understood:


@@ -332,7 +348,7 @@ set alias_file="$my_confdir/aliases"
 # 
 
 
 # 
 
 

-# 3.21. attach_save_dir
+# 3.22. attach_save_dir

 # 
 # Type: path
 # Default: “./”
 # 
 # Type: path
 # Default: “./”


@@ -342,7 +358,7 @@ set alias_file="$my_confdir/aliases"
 set attach_save_dir=$tmpdir
 
 
 set attach_save_dir=$tmpdir
 
 

-# 3.22. attach_save_without_prompting
+# 3.23. attach_save_without_prompting

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -352,7 +368,7 @@ set attach_save_dir=$tmpdir
 # 
 
 
 # 
 
 

-# 3.23. attach_sep
+# 3.24. attach_sep

 # 
 # Type: string
 # Default: “n”
 # 
 # Type: string
 # Default: “n”


@@ -362,7 +378,7 @@ set attach_save_dir=$tmpdir
 # 
 
 
 # 
 
 

-# 3.24. attach_split
+# 3.25. attach_split

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -375,34 +391,52 @@ set attach_save_dir=$tmpdir
 # 
 
 
 # 
 
 

-# 3.25. attribution
+# 3.26. attribution_intro

 # 
 # Type: string
 # Default: “On %d, %n wrote:”
 # 
 # 
 # Type: string
 # Default: “On %d, %n wrote:”
 # 

-# This is the string that will precede a message which has been included in a
-# reply. For a full listing of defined printf(3)-like sequences see the section
-# on $index_format.
+# This is the string that will precede a replied-to message which is quoted in
+# the main body of the reply (this is the case when $include is set).
+# 
+# For a full listing of defined printf(3)-like sequences see the section on
+# $index_format. See also $attribution_locale.

 # 
 # 

-set attribution="$my_attribution_en"

 
 
 
 

-# 3.26. attribution_locale
+# 3.27. attribution_locale

 # 
 # Type: string
 # Default: (empty)
 # 
 # 
 # Type: string
 # Default: (empty)
 # 

-# The locale used by strftime(3) to format dates in the attribution string. Legal
-# values are the strings your system accepts for the locale environment variable
-# $LC_TIME. 
+# The locale used by strftime(3) to format dates in the attribution strings.
+# Legal values are the strings your system accepts for the locale environment
+# variable $LC_TIME.

 # 
 # This variable is to allow the attribution date format to be customized by
 # recipient or folder using hooks. By default, NeoMutt will use your locale
 # environment, so there is no need to set this except to override that default.
 # 
 # 
 # This variable is to allow the attribution date format to be customized by
 # recipient or folder using hooks. By default, NeoMutt will use your locale
 # environment, so there is no need to set this except to override that default.
 # 

+# Affected variables are: $attribution_intro, $attribution_trailer,
+# $forward_attribution_intro, $forward_attribution_trailer, $indent_string.
+# 
+
+
+# 3.28. attribution_trailer
+# 
+# Type: string
+# Default: (empty)
+# 
+# Similar to the $attribution_intro variable, this is the string that will come
+# after a replied-to message which is quoted in the main body of the reply (this
+# is the case when $include is set).
+# 
+# For a full listing of defined printf(3)-like sequences see the section on
+# $index_format. See also $attribution_locale.
+# 

 
 
 
 

-# 3.27. auto_edit
+# 3.29. auto_edit

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -421,7 +455,7 @@ set attribution="$my_attribution_en"
 set auto_edit=yes
 
 
 set auto_edit=yes
 
 

-# 3.28. auto_subscribe
+# 3.30. auto_subscribe

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -434,7 +468,7 @@ set auto_edit=yes
 # 
 
 
 # 
 
 

-# 3.29. auto_tag
+# 3.31. auto_tag

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -446,7 +480,7 @@ set auto_edit=yes
 # 
 
 
 # 
 
 

-# 3.30. autocrypt
+# 3.32. autocrypt

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -457,7 +491,7 @@ set auto_edit=yes
 # 
 
 
 # 
 
 

-# 3.31. autocrypt_acct_format
+# 3.33. autocrypt_acct_format

 # 
 # Type: string
 # Default: “%4n %-30a %20p %10s”
 # 
 # Type: string
 # Default: “%4n %-30a %20p %10s”


@@ -465,23 +499,29 @@ set auto_edit=yes
 # This variable describes the format of the "autocrypt account" menu. The
 # following printf(3)-style sequences are understood
 # 
 # This variable describes the format of the "autocrypt account" menu. The
 # following printf(3)-style sequences are understood
 # 

-# ┌──┬─────────────────────────────┐ 
-# │%a│email address                │
-# ├──┼─────────────────────────────┤ 
-# │%k│gpg keyid                    │
-# ├──┼─────────────────────────────┤ 
-# │%n│current entry number         │
-# ├──┼─────────────────────────────┤ 
-# │%p│prefer-encrypt flag          │
-# ├──┼─────────────────────────────┤ 
-# │%s│status flag (active/inactive)│
-# └──┴─────────────────────────────┘ 
+# ┌───┬───────────────────────────────────────────────────────────────┐ 
+# │%a │email address                                                  │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%k │gpg keyid                                                      │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%n │current entry number                                           │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%p │prefer-encrypt flag                                            │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%s │status flag (active/inactive)                                  │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%>X│right justify the rest of the string and pad with character "X"│
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%|X│pad to the end of the line with character "X"                  │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%*X│soft-fill with character "X" as pad                            │
+# └───┴───────────────────────────────────────────────────────────────┘ 

 # 
 # (Autocrypt only)
 # 
 
 
 # 
 # (Autocrypt only)
 # 
 
 

-# 3.32. autocrypt_dir
+# 3.34. autocrypt_dir

 # 
 # Type: path
 # Default: “~/.mutt/autocrypt”
 # 
 # Type: path
 # Default: “~/.mutt/autocrypt”


@@ -491,7 +531,7 @@ set auto_edit=yes
 # 
 
 
 # 
 
 

-# 3.33. autocrypt_reply
+# 3.35. autocrypt_reply

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -503,7 +543,7 @@ set auto_edit=yes
 # 
 
 
 # 
 
 

-# 3.34. beep
+# 3.36. beep

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -513,7 +553,7 @@ set auto_edit=yes
 set beep=no
 
 
 set beep=no
 
 

-# 3.35. beep_new
+# 3.37. beep_new

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -524,7 +564,7 @@ set beep=no
 # 
 
 
 # 
 
 

-# 3.36. bounce
+# 3.38. bounce

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -536,7 +576,7 @@ set beep=no
 # 
 
 
 # 
 
 

-# 3.37. bounce_delivered
+# 3.39. bounce_delivered

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -544,12 +584,12 @@ set beep=no
 # When this variable is set, NeoMutt will include Delivered-To headers when
 # bouncing messages. Postfix users may wish to unset this variable.
 # 
 # When this variable is set, NeoMutt will include Delivered-To headers when
 # bouncing messages. Postfix users may wish to unset this variable.
 # 

-# Note: On Debian systems, this option is unset by default in /etc/Muttrc.
+# Note: On Debian systems, this option is unset by default in /etc/neomuttrc.

 # 
 set bounce_delivered=no
 
 
 # 
 set bounce_delivered=no
 
 

-# 3.38. braille_friendly
+# 3.40. braille_friendly

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -562,7 +602,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.39. browser_abbreviate_mailboxes
+# 3.41. browser_abbreviate_mailboxes

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -577,7 +617,16 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.40. catchup_newsgroup
+# 3.42. browser_sort_dirs_first
+# 
+# Type: boolean
+# Default: no
+# 
+# If this variable is set, the browser will group directories before files.
+# 
+
+
+# 3.43. catchup_newsgroup

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -587,7 +636,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.41. certificate_file
+# 3.44. certificate_file

 # 
 # Type: path
 # Default: “~/.mutt_certificates”
 # 
 # Type: path
 # Default: “~/.mutt_certificates”


@@ -605,9 +654,11 @@ set bounce_delivered=no
 # 
 # set certificate_file=~/.neomutt/certificates
 # 
 # 
 # set certificate_file=~/.neomutt/certificates
 # 

+# (OpenSSL and GnuTLS only)
+# 

 
 
 
 

-# 3.42. change_folder_next
+# 3.45. change_folder_next

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -618,7 +669,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.43. charset
+# 3.46. charset

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -634,7 +685,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.44. check_mbox_size
+# 3.47. check_mbox_size

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -653,7 +704,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.45. check_new
+# 3.48. check_new

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -668,7 +719,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.46. collapse_all
+# 3.49. collapse_all

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -677,7 +728,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.47. collapse_flagged
+# 3.50. collapse_flagged

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -687,7 +738,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.48. collapse_unread
+# 3.51. collapse_unread

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -697,7 +748,44 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.49. compose_format
+# 3.52. color_directcolor
+# 
+# Type: boolean
+# Default: no
+# 
+# When set, NeoMutt will use and allow 24bit colours (aka truecolor aka
+# directcolor). For colours to work properly support from the terminal is
+# required as well as a properly set TERM environment variable advertising the
+# terminals directcolor capability, e.g. "TERM=xterm-direct".
+# 
+# NeoMutt tries to detect whether the terminal supports 24bit colours and enables
+# this variable if it does. If this fails for some reason, you can force 24bit
+# colours by setting this variable manually. You may also try to force a certain
+# TERM environment variable by starting NeoMutt from a terminal as follows (this
+# results in wrong colours if the terminal does not implement directcolors):
+# 
+# TERM=xterm-direct neomutt
+# 
+# Note: This variable must be set before using any `color` commands.
+# 
+
+
+# 3.53. compose_confirm_detach_first
+# 
+# Type: boolean
+# Default: yes
+# 
+# When set, NeoMutt will prompt for confirmation when trying to use <detach-file>
+# on the first entry in the compose menu. This is to help prevent irreversible
+# loss of the typed message by accidentally hitting 'D' in the menu.
+# 
+# Note: NeoMutt only prompts for the first entry. It doesn't keep track of which
+# message is the typed message if the entries are reordered, or if the first
+# entry was already deleted.
+# 
+
+
+# 3.54. compose_format

 # 
 # Type: string
 # Default: “-- NeoMutt: Compose  [Approx. msg size: %l   Atts: %a]%>-”
 # 
 # Type: string
 # Default: “-- NeoMutt: Compose  [Approx. msg size: %l   Atts: %a]%>-”


@@ -728,7 +816,7 @@ set bounce_delivered=no
 # 
 
 
 # 
 
 

-# 3.50. compose_show_user_headers
+# 3.55. compose_show_user_headers

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -738,7 +826,8 @@ set bounce_delivered=no
 # 
 set compose_show_user_headers=no
 
 # 
 set compose_show_user_headers=no
 

-# 3.51. config_charset
+
+# 3.56. config_charset

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -750,13 +839,13 @@ set compose_show_user_headers=no
 # Please note that if setting $charset it must be done before setting
 # $config_charset. 
 # 
 # Please note that if setting $charset it must be done before setting
 # $config_charset. 
 # 

-# Recoding should be avoided as it may render unconvertable characters as
+# Recoding should be avoided as it may render unconvertible characters as

 # question marks which can lead to undesired side effects (for example in regular
 # expressions). 
 # 
 
 
 # question marks which can lead to undesired side effects (for example in regular
 # expressions). 
 # 
 
 

-# 3.52. confirm_append
+# 3.57. confirm_append

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -767,7 +856,7 @@ set compose_show_user_headers=no
 set confirm_append=no
 
 
 set confirm_append=no
 
 

-# 3.53. confirm_create
+# 3.58. confirm_create

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -777,19 +866,7 @@ set confirm_append=no
 # 
 
 
 # 
 
 

-# 3.54. connect_timeout
-# 
-# Type: number
-# Default: 30
-# 
-# Causes NeoMutt to timeout a network connection (for IMAP, POP or SMTP) after
-# this many seconds if the connection is not able to be established. A negative
-# value causes NeoMutt to wait indefinitely for the connection attempt to
-# succeed. 
-# 
-
-
-# 3.55. content_type
+# 3.59. content_type

 # 
 # Type: string
 # Default: “text/plain”
 # 
 # Type: string
 # Default: “text/plain”


@@ -799,7 +876,7 @@ set confirm_append=no
 set content_type="text/plain; markup=markdown"
 
 
 set content_type="text/plain; markup=markdown"
 
 

-# 3.56. copy
+# 3.60. copy

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -811,7 +888,7 @@ set content_type="text/plain; markup=markdown"
 set copy=yes
 
 
 set copy=yes
 
 

-# 3.57. copy_decode_weed
+# 3.61. copy_decode_weed

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -821,7 +898,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.58. count_alternatives
+# 3.62. count_alternatives

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -837,7 +914,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.59. crypt_auto_encrypt
+# 3.63. crypt_auto_encrypt

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -851,7 +928,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.60. crypt_auto_pgp
+# 3.64. crypt_auto_pgp

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -863,7 +940,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.61. crypt_auto_sign
+# 3.65. crypt_auto_sign

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -877,7 +954,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.62. crypt_auto_smime
+# 3.66. crypt_auto_smime

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -889,7 +966,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.63. crypt_chars
+# 3.67. crypt_chars

 # 
 # Type: character string
 # Default: “SPsK ”
 # 
 # Type: character string
 # Default: “SPsK ”


@@ -913,7 +990,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.64. crypt_confirm_hook
+# 3.68. crypt_confirm_hook

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -924,7 +1001,7 @@ set copy=yes
 # 
 
 
 # 
 
 

-# 3.65. crypt_opportunistic_encrypt
+# 3.69. crypt_opportunistic_encrypt

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -948,7 +1025,7 @@ set copy=yes
 set crypt_opportunistic_encrypt=no
 
 
 set crypt_opportunistic_encrypt=no
 
 

-# 3.66. crypt_opportunistic_encrypt_strong_keys
+# 3.70. crypt_opportunistic_encrypt_strong_keys

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -965,7 +1042,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.67. crypt_protected_headers_read
+# 3.71. crypt_protected_headers_read

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -988,7 +1065,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.68. crypt_protected_headers_save
+# 3.72. crypt_protected_headers_save

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1011,7 +1088,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.69. crypt_protected_headers_subject
+# 3.73. crypt_protected_headers_subject

 # 
 # Type: string
 # Default: “...”
 # 
 # Type: string
 # Default: “...”


@@ -1025,7 +1102,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.70. crypt_protected_headers_write
+# 3.74. crypt_protected_headers_write

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1041,7 +1118,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.71. crypt_reply_encrypt
+# 3.75. crypt_reply_encrypt

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1051,7 +1128,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.72. crypt_reply_sign
+# 3.76. crypt_reply_sign

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1063,7 +1140,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.73. crypt_reply_sign_encrypted
+# 3.77. crypt_reply_sign_encrypted

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1076,7 +1153,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.74. crypt_timestamp
+# 3.78. crypt_timestamp

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1088,7 +1165,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.75. crypt_use_gpgme
+# 3.79. crypt_use_gpgme

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1103,7 +1180,7 @@ set crypt_opportunistic_encrypt=no
 # 
 
 
 # 
 
 

-# 3.76. crypt_use_pka
+# 3.80. crypt_use_pka

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1115,7 +1192,7 @@ set crypt_opportunistic_encrypt=no
 set crypt_use_pka=yes
 
 
 set crypt_use_pka=yes
 
 

-# 3.77. crypt_verify_sig
+# 3.81. crypt_verify_sig

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -1126,11 +1203,15 @@ set crypt_use_pka=yes
 # 
 
 
 # 
 
 

-# 3.78. date_format
+# 3.82. date_format

 # 
 # Type: string
 # Default: “!%a, %b %d, %Y at %I:%M:%S%p %Z”
 # 
 # 
 # Type: string
 # Default: “!%a, %b %d, %Y at %I:%M:%S%p %Z”
 # 

+# Instead of using $date_format it is encouraged to use "%[fmt]" directly in the
+# corresponding format strings, where "fmt" is the value of $date_format. This
+# allows for a more fine grained control of the different menu needs.
+# 

 # This variable controls the format of the date printed by the "%d" sequence in
 # $index_format. This is passed to the strftime(3) function to process the date,
 # see the man page for the proper syntax.
 # This variable controls the format of the date printed by the "%d" sequence in
 # $index_format. This is passed to the strftime(3) function to process the date,
 # see the man page for the proper syntax.


@@ -1140,10 +1221,17 @@ set crypt_use_pka=yes
 # string is a bang, the bang is discarded, and the month and week day names in
 # the rest of the string are expanded in the C locale (that is in US English).
 # 
 # string is a bang, the bang is discarded, and the month and week day names in
 # the rest of the string are expanded in the C locale (that is in US English).
 # 

+# Format strings using this variable are:
+# 
+# UI: $folder_format, $index_format, $mailbox_folder_format, $message_format
+# 
+# Composing: $attribution_intro, $forward_attribution_intro,
+# $forward_attribution_trailer, $forward_format, $indent_string.
+# 

 set date_format="%F"
 
 
 set date_format="%F"
 
 

-# 3.79. debug_file
+# 3.83. debug_file

 # 
 # Type: path
 # Default: “~/.neomuttdebug”
 # 
 # Type: path
 # Default: “~/.neomuttdebug”


@@ -1159,7 +1247,7 @@ set date_format="%F"
 # 
 
 
 # 
 
 

-# 3.80. debug_level
+# 3.84. debug_level

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -1179,16 +1267,19 @@ set date_format="%F"
 # 
 
 
 # 
 
 

-# 3.81. default_hook
+# 3.85. default_hook

 # 
 # Type: string
 # Default: “~f %s !~P | (~P ~C %s)”
 # 
 # 
 # Type: string
 # Default: “~f %s !~P | (~P ~C %s)”
 # 

-# This variable controls how "message-hook", "reply-hook", "send-hook", "
-# send2-hook", "save-hook", and "fcc-hook" will be interpreted if they are
-# specified with only a simple regex, instead of a matching pattern. The hooks
-# are expanded when they are declared, so a hook will be interpreted according to
-# the value of this variable at the time the hook is declared.
+# This variable controls how some hooks are interpreted if their pattern is a
+# plain string or a regex. i.e. they don't contain a pattern, like ~f
+# 
+# The hooks are: fcc-hook, fcc-save-hook, index-format-hook, message-hook,
+# reply-hook, save-hook, send-hook and send2-hook.
+# 
+# The hooks are expanded when they are declared, so a hook will be interpreted
+# according to the value of this variable at the time the hook is declared.

 # 
 # The default value matches if the message is either from a user matching the
 # regular expression given, or if it is from you (if the from address matches "
 # 
 # The default value matches if the message is either from a user matching the
 # regular expression given, or if it is from you (if the from address matches "


@@ -1197,7 +1288,7 @@ set date_format="%F"
 # 
 
 
 # 
 
 

-# 3.82. delete
+# 3.86. delete

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -1210,7 +1301,7 @@ set date_format="%F"
 set delete=yes
 
 
 set delete=yes
 
 

-# 3.83. delete_untag
+# 3.87. delete_untag

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1221,7 +1312,7 @@ set delete=yes
 # 
 
 
 # 
 
 

-# 3.84. digest_collapse
+# 3.88. digest_collapse

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1232,7 +1323,7 @@ set delete=yes
 # 
 
 
 # 
 
 

-# 3.85. display_filter
+# 3.89. display_filter

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -1254,7 +1345,7 @@ set delete=yes
 # 
 
 
 # 
 
 

-# 3.86. dsn_notify
+# 3.90. dsn_notify

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -1277,7 +1368,7 @@ set delete=yes
 # 
 
 
 # 
 
 

-# 3.87. dsn_return
+# 3.91. dsn_return

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -1298,7 +1389,7 @@ set delete=yes
 # 
 
 
 # 
 
 

-# 3.88. duplicate_threads
+# 3.92. duplicate_threads

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1310,7 +1401,7 @@ set delete=yes
 # 
 
 
 # 
 
 

-# 3.89. edit_headers
+# 3.93. edit_headers

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1330,7 +1421,7 @@ set delete=yes
 set edit_headers=yes
 
 
 set edit_headers=yes
 
 

-# 3.90. editor
+# 3.94. editor

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -1352,7 +1443,7 @@ set edit_headers=yes
 set editor="mailplate --edit --auto --keep-unknown"
 
 
 set editor="mailplate --edit --auto --keep-unknown"
 
 

-# 3.91. empty_subject
+# 3.95. empty_subject

 # 
 # Type: string
 # Default: “Re: your mail”
 # 
 # Type: string
 # Default: “Re: your mail”


@@ -1362,7 +1453,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.92. encode_from
+# 3.96. encode_from

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1375,7 +1466,17 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.93. envelope_from_address
+# 3.97. entropy_file
+# 
+# Type: path
+# Default: (empty)
+# 
+# The file which includes random data that is used to initialize SSL library
+# functions. (OpenSSL only)
+# 
+
+
+# 3.98. envelope_from_address

 # 
 # Type: e-mail address
 # Default: (empty)
 # 
 # Type: e-mail address
 # Default: (empty)


@@ -1385,7 +1486,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.94. external_search_command
+# 3.99. external_search_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -1419,7 +1520,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.95. fast_reply
+# 3.100. fast_reply

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1437,7 +1538,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.96. fcc_attach
+# 3.101. fcc_attach

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -1449,7 +1550,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.97. fcc_before_send
+# 3.102. fcc_before_send

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1465,7 +1566,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.98. fcc_clear
+# 3.103. fcc_clear

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1480,7 +1581,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.99. flag_chars
+# 3.104. flag_chars

 # 
 # Type: character string
 # Default: “*!DdrONon- ”
 # 
 # Type: character string
 # Default: “*!DdrONon- ”


@@ -1515,7 +1616,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.100. flag_safe
+# 3.105. flag_safe

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1524,7 +1625,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 # 
 
 
 # 
 
 

-# 3.101. folder
+# 3.106. folder

 # 
 # Type: mailbox
 # Default: “~/Mail”
 # 
 # Type: mailbox
 # Default: “~/Mail”


@@ -1538,7 +1639,7 @@ set editor="mailplate --edit --auto --keep-unknown"
 set folder="~/mail"
 
 
 set folder="~/mail"
 
 

-# 3.102. folder_format
+# 3.107. folder_format

 # 
 # Type: string
 # Default: “%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %i”
 # 
 # Type: string
 # Default: “%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %i”


@@ -1547,42 +1648,51 @@ set folder="~/mail"
 # taste. This string is similar to $index_format, but has its own set of printf
 # (3)-like sequences:
 # 
 # taste. This string is similar to $index_format, but has its own set of printf
 # (3)-like sequences:
 # 

-# ┌───┬─┬───────────────────────────────────────────────────────────────────────┐ 
-# │%C │ │Current file number                                                    │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%d │ │Date/time folder was last modified                                     │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%D │ │Date/time folder was last modified using $date_format.                 │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%f │ │Filename ("/" is appended to directory names, "@" to symbolic links and│
-# │ │ │"*" to executable files)                                               │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%F │ │File permissions                                                       │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%g │ │Group name (or numeric gid, if missing)                                │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%i │ │Description of the folder                                              │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%l │ │Number of hard links                                                   │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%m │*│Number of messages in the mailbox                                      │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%n │*│Number of unread messages in the mailbox                               │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%N │ │"N" if mailbox has new mail, blank otherwise                           │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%s │ │Size in bytes (see formatstrings-size)                                 │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%t │ │"*" if the file is tagged, blank otherwise                             │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%u │ │Owner name (or numeric uid, if missing)                                │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%>X│ │Right justify the rest of the string and pad with character "X"        │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%|X│ │Pad to the end of the line with character "X"                          │
-# ├───┼─┼───────────────────────────────────────────────────────────────────────┤ 
-# │%*X│ │Soft-fill with character "X" as pad                                    │
-# └───┴─┴───────────────────────────────────────────────────────────────────────┘ 
+# ┌─────┬─┬─────────────────────────────────────────────────────────────────────┐ 
+# │%a │ │Alert: 1 if user is notified of new mail                             │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%C │ │Current file number                                                  │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%d │ │Date/time folder was last modified                                   │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │ │ │Date/time folder was last modified using $date_format. It is         │
+# │%D │ │encouraged to use "%[fmt]" instead, where "fmt" is the value of      │
+# │ │ │$date_format.                                                        │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%f │ │Filename ("/" is appended to directory names, "@" to symbolic links  │
+# │ │ │and "*" to executable files)                                         │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%F │ │File permissions                                                     │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%g │ │Group name (or numeric gid, if missing)                              │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%i │ │Description of the folder                                            │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%l │ │Number of hard links                                                 │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%m │*│Number of messages in the mailbox                                    │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%n │*│Number of unread messages in the mailbox                             │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%N │ │"N" if mailbox has new mail, " " (space) otherwise                   │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%p │ │Poll: 1 if Mailbox is checked for new mail                           │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%s │ │Size in bytes (see formatstrings-size)                               │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%t │ │"*" if the file is tagged, blank otherwise                           │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%u │ │Owner name (or numeric uid, if missing)                              │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │% │ │Date/time folder was last modified using an strftime(3) expression   │
+# │[fmt]│ │                                                                     │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%>X │ │Right justify the rest of the string and pad with character "X"      │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%|X │ │Pad to the end of the line with character "X"                        │
+# ├─────┼─┼─────────────────────────────────────────────────────────────────────┤ 
+# │%*X │ │Soft-fill with character "X" as pad                                  │
+# └─────┴─┴─────────────────────────────────────────────────────────────────────┘ 

 # 
 # For an explanation of "soft-fill", see the $index_format documentation.
 # 
 # 
 # For an explanation of "soft-fill", see the $index_format documentation.
 # 


@@ -1594,7 +1704,7 @@ set folder="~/mail"
 set folder_format='%t%N%2C  %D  %4s  %f'
 
 
 set folder_format='%t%N%2C  %D  %4s  %f'
 
 

-# 3.103. followup_to
+# 3.108. followup_to

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1616,7 +1726,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.104. followup_to_poster
+# 3.109. followup_to_poster

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -1627,7 +1737,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.105. force_name
+# 3.110. force_name

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1640,7 +1750,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.106. forward_attachments
+# 3.111. forward_attachments

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -1652,7 +1762,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.107. forward_attribution_intro
+# 3.112. forward_attribution_intro

 # 
 # Type: string
 # Default: “----- Forwarded message from %f -----”
 # 
 # Type: string
 # Default: “----- Forwarded message from %f -----”


@@ -1664,7 +1774,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.108. forward_attribution_trailer
+# 3.113. forward_attribution_trailer

 # 
 # Type: string
 # Default: “----- End forwarded message -----”
 # 
 # Type: string
 # Default: “----- End forwarded message -----”


@@ -1676,7 +1786,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.109. forward_decode
+# 3.114. forward_decode

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1688,18 +1798,18 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.110. forward_decrypt
+# 3.115. forward_decrypt

 # 
 # Type: boolean
 # 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
 # 
 # Type: boolean
 # 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)
+# $mime_forward is set and $mime_forward_decode is unset.

 # 
 
 
 # 
 
 

-# 3.111. forward_edit
+# 3.116. forward_edit

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -1710,7 +1820,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 # 
 
 
 # 
 
 

-# 3.112. forward_format
+# 3.117. forward_format

 # 
 # Type: string
 # Default: “[%a: %s]”
 # 
 # Type: string
 # Default: “[%a: %s]”


@@ -1721,7 +1831,7 @@ set folder_format='%t%N%2C  %D  %4s  %f'
 set forward_format="(fwd) %s"
 
 
 set forward_format="(fwd) %s"
 
 

-# 3.113. forward_quote
+# 3.118. forward_quote

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1731,7 +1841,7 @@ set forward_format="(fwd) %s"
 # 
 
 
 # 
 
 

-# 3.114. forward_references
+# 3.119. forward_references

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1742,7 +1852,7 @@ set forward_format="(fwd) %s"
 # 
 
 
 # 
 
 

-# 3.115. from
+# 3.120. from

 # 
 # Type: e-mail address
 # Default: (empty)
 # 
 # Type: e-mail address
 # Default: (empty)


@@ -1756,7 +1866,7 @@ set forward_format="(fwd) %s"
 set from='martin f krafft <madduck@madduck.net>'
 
 
 set from='martin f krafft <madduck@madduck.net>'
 
 

-# 3.116. from_chars
+# 3.121. from_chars

 # 
 # Type: character string
 # Default: (empty)
 # 
 # Type: character string
 # Default: (empty)


@@ -1789,7 +1899,7 @@ set from='martin f krafft <madduck@madduck.net>'
 # 
 
 
 # 
 
 

-# 3.117. gecos_mask
+# 3.122. gecos_mask

 # 
 # Type: regular expression
 # Default: “^[^,]*”
 # 
 # Type: regular expression
 # Default: “^[^,]*”


@@ -1807,7 +1917,7 @@ set from='martin f krafft <madduck@madduck.net>'
 # 
 
 
 # 
 
 

-# 3.118. greeting
+# 3.123. greeting

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -1829,7 +1939,7 @@ set from='martin f krafft <madduck@madduck.net>'
 # 
 
 
 # 
 
 

-# 3.119. group_index_format
+# 3.124. group_index_format

 # 
 # Type: string
 # Default: “%4C %M%N %5s  %-45.45f %d”
 # 
 # Type: string
 # Default: “%4C %M%N %5s  %-45.45f %d”


@@ -1839,6 +1949,8 @@ set from='martin f krafft <madduck@madduck.net>'
 # of printf()-like sequences:
 # 
 # ┌───┬──────────────────────────────────────────────────────────────────┐ 
 # of printf()-like sequences:
 # 
 # ┌───┬──────────────────────────────────────────────────────────────────┐ 

+# │%a │Alert: 1 if user is notified of new mail                          │
+# ├───┼──────────────────────────────────────────────────────────────────┤ 

 # │%C │Current newsgroup number                                          │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%d │Description of newsgroup (becomes from server)                    │
 # │%C │Current newsgroup number                                          │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%d │Description of newsgroup (becomes from server)                    │


@@ -1851,16 +1963,20 @@ set from='martin f krafft <madduck@madduck.net>'
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%n │Number of new articles in newsgroup                               │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%n │Number of new articles in newsgroup                               │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 

+# │%p │Poll: 1 if Mailbox is checked for new mail                        │
+# ├───┼──────────────────────────────────────────────────────────────────┤ 

 # │%s │Number of unread articles in newsgroup                            │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%>X│Right justify the rest of the string and pad with character "X"   │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%|X│Pad to the end of the line with character "X"                     │
 # │%s │Number of unread articles in newsgroup                            │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%>X│Right justify the rest of the string and pad with character "X"   │
 # ├───┼──────────────────────────────────────────────────────────────────┤ 
 # │%|X│Pad to the end of the line with character "X"                     │

+# ├───┼──────────────────────────────────────────────────────────────────┤ 
+# │%*X│Soft-fill with character "X" as pad                               │

 # └───┴──────────────────────────────────────────────────────────────────┘ 
 # 
 
 
 # └───┴──────────────────────────────────────────────────────────────────┘ 
 # 
 
 

-# 3.120. hdrs
+# 3.125. hdrs

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1872,7 +1988,7 @@ set from='martin f krafft <madduck@madduck.net>'
 # 
 
 
 # 
 
 

-# 3.121. header
+# 3.126. header

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1882,7 +1998,7 @@ set from='martin f krafft <madduck@madduck.net>'
 # 
 
 
 # 
 
 

-# 3.122. header_cache
+# 3.127. header_cache

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -1894,12 +2010,12 @@ set from='martin f krafft <madduck@madduck.net>'
 # is unset so no header caching will be used.
 # 
 # Header caching can greatly improve speed when opening POP, IMAP MH or Maildir
 # is unset so no header caching will be used.
 # 
 # Header caching can greatly improve speed when opening POP, IMAP MH or Maildir

-# folders, see "caching" for details.
+# folders, see "caching" in the NeoMutt Guide for details.

 # 
 set header_cache="~/.var/neomutt/header_cache"
 
 
 # 
 set header_cache="~/.var/neomutt/header_cache"
 
 

-# 3.123. header_cache_backend
+# 3.128. header_cache_backend

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -1910,7 +2026,28 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.124. header_color_partial
+# 3.129. header_cache_compress_level
+# 
+# Type: number
+# Default: 1
+# 
+# When NeoMutt is compiled with lz4, zstd or zlib, this option can be used to
+# setup the compression level.
+# 
+
+
+# 3.130. header_cache_compress_method
+# 
+# Type: string
+# Default: (empty)
+# 
+# When NeoMutt is compiled with lz4, zstd or zlib, the header cache backend can
+# use these compression methods for compressing the cache files. This results in
+# much smaller cache file sizes and may even improve speed.
+# 
+
+
+# 3.131. header_color_partial

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1925,7 +2062,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.125. help
+# 3.132. help

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1940,19 +2077,17 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.126. hidden_host
+# 3.133. hidden_host

 # 
 # Type: boolean
 # Default: no
 # 
 # When set, NeoMutt will skip the host name part of $hostname variable when
 # 
 # Type: boolean
 # Default: no
 # 
 # When set, NeoMutt will skip the host name part of $hostname variable when

-# adding the domain part to addresses. This variable does not affect the
-# generation of Message-IDs, and it will not lead to the cut-off of first-level
-# domains. 
+# adding the domain part to addresses.

 # 
 
 
 # 
 
 

-# 3.127. hidden_tags
+# 3.134. hidden_tags

 # 
 # Type: string list
 # Default: “unread,draft,flagged,passed,replied,attachment,signed,encrypted”
 # 
 # Type: string list
 # Default: “unread,draft,flagged,passed,replied,attachment,signed,encrypted”


@@ -1962,7 +2097,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.128. hide_limited
+# 3.135. hide_limited

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -1972,7 +2107,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.129. hide_missing
+# 3.136. hide_missing

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1982,7 +2117,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.130. hide_thread_subject
+# 3.137. hide_thread_subject

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -1992,7 +2127,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.131. hide_top_limited
+# 3.138. hide_top_limited

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2003,7 +2138,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.132. hide_top_missing
+# 3.139. hide_top_missing

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2014,7 +2149,7 @@ set header_cache="~/.var/neomutt/header_cache"
 # 
 
 
 # 
 
 

-# 3.133. history
+# 3.140. history

 # 
 # Type: number
 # Default: 10
 # 
 # Type: number
 # Default: 10


@@ -2023,9 +2158,18 @@ set header_cache="~/.var/neomutt/header_cache"
 # history buffer per category. The buffer is cleared each time the variable is
 # set. 
 # 
 # history buffer per category. The buffer is cleared each time the variable is
 # set. 
 # 

+# Note that strings (e.g. commands) starting with a space are never recorded in
+# the history. This is for example useful to prevent leaking sensitive
+# information into the history file or for one off tests.
+# 
+# Also note that a string is not added to the history if it exactly matches its
+# immediate predecessor, e.g. executing the same command twice in a row results
+# in only one copy being added to the history. To prevent duplicates over all
+# entries use $history_remove_dups.
+# 

 
 
 
 

-# 3.134. history_file
+# 3.141. history_file

 # 
 # Type: path
 # Default: “~/.mutthistory”
 # 
 # Type: path
 # Default: “~/.mutthistory”


@@ -2037,7 +2181,29 @@ set header_cache="~/.var/neomutt/header_cache"
 set history_file="~/.var/neomutt/history"
 
 
 set history_file="~/.var/neomutt/history"
 
 

-# 3.135. history_remove_dups
+# 3.142. history_format
+# 
+# Type: string
+# Default: “%s”
+# 
+# Controls the format of the entries of the history list. This string is similar
+# to $index_format, but has its own set of printf(3)-like sequences:
+# 
+# ┌───┬───────────────────────────────────────────────────────────────┐ 
+# │%C │Line number                                                    │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%s │History match                                                  │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%>X│right justify the rest of the string and pad with character "X"│
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%|X│pad to the end of the line with character "X"                  │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%*X│soft-fill with character "X" as pad                            │
+# └───┴───────────────────────────────────────────────────────────────┘ 
+# 
+
+
+# 3.143. history_remove_dups

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2048,7 +2214,7 @@ set history_file="~/.var/neomutt/history"
 # 
 
 
 # 
 
 

-# 3.136. honor_disposition
+# 3.144. honor_disposition

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2062,7 +2228,7 @@ set history_file="~/.var/neomutt/history"
 # 
 
 
 # 
 
 

-# 3.137. honor_followup_to
+# 3.145. honor_followup_to

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -2072,15 +2238,14 @@ set history_file="~/.var/neomutt/history"
 # 
 
 
 # 
 
 

-# 3.138. hostname
+# 3.146. hostname

 # 
 # Type: string
 # Default: (empty)
 # 
 # Specifies the fully-qualified hostname of the system NeoMutt is running on
 # containing the host's name and the DNS domain it belongs to. It is used as the
 # 
 # Type: string
 # Default: (empty)
 # 
 # Specifies the fully-qualified hostname of the system NeoMutt is running on
 # containing the host's name and the DNS domain it belongs to. It is used as the

-# domain part (after "@") for local email addresses as well as Message-Id
-# headers. 
+# domain part (after "@") for local email addresses.

 # 
 # If not specified in a config file, then NeoMutt will try to determine the
 # hostname itself.
 # 
 # If not specified in a config file, then NeoMutt will try to determine the
 # hostname itself.


@@ -2090,11 +2255,11 @@ set history_file="~/.var/neomutt/history"
 # Also see $use_domain and $hidden_host.
 # 
 # Note: On Debian systems, the default for this variable is obtained from /etc/
 # Also see $use_domain and $hidden_host.
 # 
 # Note: On Debian systems, the default for this variable is obtained from /etc/

-# mailname when Mutt starts.
+# mailname when NeoMutt starts.

 # 
 
 
 # 
 
 

-# 3.139. idn_decode
+# 3.147. idn_decode

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2105,7 +2270,7 @@ set history_file="~/.var/neomutt/history"
 # 
 
 
 # 
 
 

-# 3.140. idn_encode
+# 3.148. idn_encode

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2116,7 +2281,7 @@ set history_file="~/.var/neomutt/history"
 # 
 
 
 # 
 
 

-# 3.141. ignore_list_reply_to
+# 3.149. ignore_list_reply_to

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2132,7 +2297,7 @@ set history_file="~/.var/neomutt/history"
 set ignore_list_reply_to=yes
 
 
 set ignore_list_reply_to=yes
 
 

-# 3.142. imap_authenticators
+# 3.150. imap_authenticators

 # 
 # Type: string list
 # Default: (empty)
 # 
 # Type: string list
 # Default: (empty)


@@ -2154,7 +2319,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.143. imap_check_subscribed
+# 3.151. imap_check_subscribed

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2165,7 +2330,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.144. imap_condstore
+# 3.152. imap_condstore

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2180,7 +2345,20 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.145. imap_delim_chars
+# 3.153. imap_deflate
+# 
+# Type: boolean
+# Default: yes
+# 
+# When set, NeoMutt will use the COMPRESS=DEFLATE extension (RFC4978) if
+# advertised by the server.
+# 
+# In general a good compression efficiency can be achieved, which speeds up
+# reading large mailboxes also on fairly good connections.
+# 
+
+
+# 3.154. imap_delim_chars

 # 
 # Type: string
 # Default: “/.”
 # 
 # Type: string
 # Default: “/.”


@@ -2190,7 +2368,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.146. imap_fetch_chunk_size
+# 3.155. imap_fetch_chunk_size

 # 
 # Type: number (long)
 # Default: 0
 # 
 # Type: number (long)
 # Default: 0


@@ -2202,7 +2380,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.147. imap_headers
+# 3.156. imap_headers

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -2219,7 +2397,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.148. imap_idle
+# 3.157. imap_idle

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2231,7 +2409,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.149. imap_keepalive
+# 3.158. imap_keep_alive

 # 
 # Type: number
 # Default: 300
 # 
 # Type: number
 # Default: 300


@@ -2246,7 +2424,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.150. imap_list_subscribed
+# 3.159. imap_list_subscribed

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2257,7 +2435,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.151. imap_login
+# 3.160. imap_login

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -2268,7 +2446,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.152. imap_oauth_refresh_command
+# 3.161. imap_oauth_refresh_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -2280,7 +2458,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.153. imap_pass
+# 3.162. imap_pass

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -2295,7 +2473,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.154. imap_passive
+# 3.163. imap_passive

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2307,7 +2485,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.155. imap_peek
+# 3.164. imap_peek

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2319,7 +2497,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.156. imap_pipeline_depth
+# 3.165. imap_pipeline_depth

 # 
 # Type: number
 # Default: 15
 # 
 # Type: number
 # Default: 15


@@ -2334,7 +2512,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.157. imap_poll_timeout
+# 3.166. imap_poll_timeout

 # 
 # Type: number
 # Default: 15
 # 
 # Type: number
 # Default: 15


@@ -2345,7 +2523,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.158. imap_qresync
+# 3.167. imap_qresync

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2360,7 +2538,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.159. imap_rfc5161
+# 3.168. imap_rfc5161

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2373,7 +2551,18 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.160. imap_server_noise
+# 3.169. imap_send_id
+# 
+# Type: boolean
+# Default: no
+# 
+# When set, NeoMutt will send an IMAP ID command (RFC2971) to the server when
+# logging in if advertised by the server. This command provides information about
+# the IMAP client, such as "NeoMutt" and the current version.
+# 
+
+
+# 3.170. imap_server_noise

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2385,7 +2574,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.161. imap_user
+# 3.171. imap_user

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -2396,7 +2585,7 @@ set ignore_list_reply_to=yes
 # 
 
 
 # 
 
 

-# 3.162. implicit_autoview
+# 3.172. implicit_auto_view

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2406,10 +2595,9 @@ set ignore_list_reply_to=yes
 # for. If such an entry is found, NeoMutt will use the viewer defined in that
 # entry to convert the body part to text form.
 # 
 # for. If such an entry is found, NeoMutt will use the viewer defined in that
 # entry to convert the body part to text form.
 # 

-set implicit_autoview=no

 
 
 
 

-# 3.163. include
+# 3.173. include

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -2420,7 +2608,7 @@ set implicit_autoview=no
 set include=yes
 
 
 set include=yes
 
 

-# 3.164. include_encrypted
+# 3.174. include_encrypted

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2435,7 +2623,7 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.165. include_only_first
+# 3.175. include_only_first

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2445,7 +2633,7 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.166. indent_string
+# 3.176. indent_string

 # 
 # Type: string
 # Default: “> ”
 # 
 # Type: string
 # Default: “> ”


@@ -2462,17 +2650,17 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.167. index_format
+# 3.177. index_format

 # 
 # Type: string
 # 
 # Type: string

-# Default: “%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s”
+# Default: “%4C %Z %{%b %d} %-15.15L (%<l?%4l&%4c>) %s”

 # 
 # This variable allows you to customize the message index display to your
 # personal taste.
 # 
 # "Format strings" are similar to the strings used in the C function printf(3) to
 # 
 # This variable allows you to customize the message index display to your
 # personal taste.
 # 
 # "Format strings" are similar to the strings used in the C function printf(3) to

-# format output (see the man page for more details). For an explanation of the %?
-# construct, see the status_format description. The following sequences are
+# format output (see the man page for more details). For an explanation of the %
+# <...> construct, see the status_format description. The following sequences are

 # defined in NeoMutt:
 # 
 # ┌───────┬─────────────────────────────────────────────────────────────────────┐ 
 # defined in NeoMutt:
 # 
 # ┌───────┬─────────────────────────────────────────────────────────────────────┐ 


@@ -2484,60 +2672,62 @@ set include=yes
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%B │Same as %K                                                           │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%B │Same as %K                                                           │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%C │Current message number                                               │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%c │Number of characters (bytes) in the body of the message (see         │
 # │ │formatstrings-size)                                                  │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%c │Number of characters (bytes) in the body of the message (see         │
 # │ │formatstrings-size)                                                  │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

+# │%C │Current message number                                               │
+# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%cr │Number of characters (bytes) in the raw message, including the header│
 # │ │(see formatstrings-size)                                             │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%cr │Number of characters (bytes) in the raw message, including the header│
 # │ │(see formatstrings-size)                                             │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%D │Date and time of message using date_format and local timezone        │
+# │ │Date and time of message using date_format and sender's timezone It  │
+# │%d │is encouraged to use "%{fmt}" instead, where "fmt" is the value of   │
+# │ │$date_format.                                                        │

 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%d │Date and time of message using date_format and sender's timezone     │
+# │ │Date and time of message using date_format and local timezone It is  │
+# │%D │encouraged to use "%[fmt]" instead, where "fmt" is the value of      │
+# │ │$date_format.                                                        │

 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%e │Current message number in thread                                     │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%E │Number of messages in current thread                                 │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%e │Current message number in thread                                     │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%E │Number of messages in current thread                                 │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

+# │%f │Sender (address + real name), either From: or Return-Path:           │
+# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%F │Author name, or recipient name if the message is from you            │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%Fp │Like %F, but plain. No contextual formatting is applied to recipient │
 # │ │name                                                                 │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%F │Author name, or recipient name if the message is from you            │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%Fp │Like %F, but plain. No contextual formatting is applied to recipient │
 # │ │name                                                                 │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%f │Sender (address + real name), either From: or Return-Path:           │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 
-# │%g │Newsgroup name (if compiled with NNTP support)                       │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%g │Message tags (e.g. notmuch tags/imap flags)                          │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%Gx │Individual message tag (e.g. notmuch tags/imap flags)                │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%H │Spam attribute(s) of this message                                    │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%g │Message tags (e.g. notmuch tags/imap flags)                          │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%Gx │Individual message tag (e.g. notmuch tags/imap flags)                │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%H │Spam attribute(s) of this message                                    │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%I │Initials of author                                                   │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%i │Message-id of the current message                                    │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%i │Message-id of the current message                                    │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

+# │%I │Initials of author                                                   │
+# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%J │Message tags (if present, tree unfolded, and != parent's tags)       │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%K │The list to which the letter was sent (if any; otherwise: empty)     │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%J │Message tags (if present, tree unfolded, and != parent's tags)       │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%K │The list to which the letter was sent (if any; otherwise: empty)     │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

+# │%l │number of lines in the unprocessed message (may not work with        │
+# │ │maildir, mh, and IMAP folders)                                       │
+# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │ │If an address in the "To:" or "Cc:" header field matches an address  │
 # │%L │Defined by the user's "subscribe" command, this displays "To         │
 # │ │<list-name>", otherwise the same as %F                               │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │ │If an address in the "To:" or "Cc:" header field matches an address  │
 # │%L │Defined by the user's "subscribe" command, this displays "To         │
 # │ │<list-name>", otherwise the same as %F                               │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%l │number of lines in the unprocessed message (may not work with        │
-# │ │maildir, mh, and IMAP folders)                                       │
+# │%m │Total number of message in the mailbox                               │

 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%M │Number of hidden messages if the thread is collapsed                 │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%M │Number of hidden messages if the thread is collapsed                 │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%m │Total number of message in the mailbox                               │
+# │%n │Author's real name (or address if missing)                           │

 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%N │Message score                                                        │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%N │Message score                                                        │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%n │Author's real name (or address if missing)                           │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%O │Original save folder where NeoMutt would formerly have Stashed the   │
 # │ │message: list name or recipient name If not sent to a list           │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%O │Original save folder where NeoMutt would formerly have Stashed the   │
 # │ │message: list name or recipient name If not sent to a list           │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 


@@ -2546,18 +2736,18 @@ set include=yes
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%q │Newsgroup name (if compiled with NNTP support)                       │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%q │Newsgroup name (if compiled with NNTP support)                       │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%R │Comma separated list of "Cc:" recipients                             │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%r │Comma separated list of "To:" recipients                             │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%r │Comma separated list of "To:" recipients                             │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%S │Single character status of the message ("N"/"O"/"D"/"d"/"!"/"r"/"*") │
+# │%R │Comma separated list of "Cc:" recipients                             │

 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%s │Subject of the message                                               │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%s │Subject of the message                                               │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%T │The appropriate character from the $to_chars string                  │
+# │%S │Single character status of the message ("N"/"O"/"D"/"d"/"!"/"r"/"*") │

 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%t │"To:" field (recipients)                                             │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%t │"To:" field (recipients)                                             │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

+# │%T │The appropriate character from the $to_chars string                  │
+# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │%u │User (login) name of the author                                      │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%v │First name of the author, or the recipient if the message is from you│
 # │%u │User (login) name of the author                                      │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%v │First name of the author, or the recipient if the message is from you│


@@ -2569,12 +2759,12 @@ set include=yes
 # │%X │Number of MIME attachments (please see the "attachments" section for │
 # │ │possible speed effects)                                              │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │%X │Number of MIME attachments (please see the "attachments" section for │
 # │ │possible speed effects)                                              │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

+# │%y │"X-Label:" field, if present                                         │
+# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │ │"X-Label:" field, if present, and (1) not at part of a thread tree,  │
 # │%Y │(2) at the top of a thread, or (3) "X-Label:" is different from      │
 # │ │Preceding message's "X-Label:"                                       │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 
 # │ │"X-Label:" field, if present, and (1) not at part of a thread tree,  │
 # │%Y │(2) at the top of a thread, or (3) "X-Label:" is different from      │
 # │ │Preceding message's "X-Label:"                                       │
 # ├───────┼─────────────────────────────────────────────────────────────────────┤ 

-# │%y │"X-Label:" field, if present                                         │
-# ├───────┼─────────────────────────────────────────────────────────────────────┤ 

 # │ │A three character set of message status flags. The first character is│
 # │ │new/read/replied flags ("n"/"o"/"r"/"O"/"N"). The second is deleted  │
 # │%Z │or encryption flags ("D"/"d"/"S"/"P"/"s"/"K"). The third is either   │
 # │ │A three character set of message status flags. The first character is│
 # │ │new/read/replied flags ("n"/"o"/"r"/"O"/"N"). The second is deleted  │
 # │%Z │or encryption flags ("D"/"d"/"S"/"P"/"s"/"K"). The third is either   │


@@ -2636,7 +2826,7 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.168. inews
+# 3.178. inews

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -2665,7 +2855,7 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.169. ispell
+# 3.179. ispell

 # 
 # Type: command
 # Default: “ispell”
 # 
 # Type: command
 # Default: “ispell”


@@ -2674,17 +2864,20 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.170. keep_flagged
+# 3.180. keep_flagged

 # 
 # Type: boolean
 # Default: no
 # 
 # If set, read messages marked as flagged will not be moved from your spool
 # 
 # Type: boolean
 # Default: no
 # 
 # If set, read messages marked as flagged will not be moved from your spool

-# mailbox to your $mbox mailbox, or as a result of a "mbox-hook" command.
+# mailbox to your $mbox mailbox or to the "mbox" specified by a mbox-hook
+# command. 
+# 
+# Note that $keep_flagged only has an effect if $move is set.

 # 
 
 
 # 
 
 

-# 3.171. local_date_header
+# 3.181. local_date_header

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2695,7 +2888,7 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.172. mail_check
+# 3.182. mail_check

 # 
 # Type: number
 # Default: 5
 # 
 # Type: number
 # Default: 5


@@ -2705,7 +2898,7 @@ set include=yes
 # 
 
 
 # 
 
 

-# 3.173. mail_check_recent
+# 3.183. mail_check_recent

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2715,21 +2908,20 @@ set include=yes
 # if any new mail exists in the mailbox, regardless of whether you have visited
 # it recently.
 # 
 # if any new mail exists in the mailbox, regardless of whether you have visited
 # it recently.
 # 

-# When $mark_old is set, NeoMutt does not consider the mailbox to contain new
-# mail if only old messages exist.
-# 

 
 
 
 

-# 3.174. mail_check_stats
+# 3.184. mail_check_stats

 # 
 # Type: boolean
 # Default: no
 # 
 # When set, NeoMutt will periodically calculate message statistics of a mailbox
 # while polling for new mail. It will check for unread, flagged, and total
 # 
 # Type: boolean
 # Default: no
 # 
 # When set, NeoMutt will periodically calculate message statistics of a mailbox
 # while polling for new mail. It will check for unread, flagged, and total

-# message counts. Because this operation is more performance intensive, it
-# defaults to unset, and has a separate option, $mail_check_stats_interval, to
-# control how often to update these counts.
+# message counts. (Note: IMAP mailboxes only support unread and total counts).
+# 
+# Because this operation is more performance intensive, it defaults to unset, and
+# has a separate option, $mail_check_stats_interval, to control how often to
+# update these counts.

 # 
 # Message statistics can also be explicitly calculated by invoking the
 # <check-stats> function.
 # 
 # Message statistics can also be explicitly calculated by invoking the
 # <check-stats> function.


@@ -2737,7 +2929,7 @@ set include=yes
 set mail_check_stats=yes
 
 
 set mail_check_stats=yes
 
 

-# 3.175. mail_check_stats_interval
+# 3.185. mail_check_stats_interval

 # 
 # Type: number
 # Default: 60
 # 
 # Type: number
 # Default: 60


@@ -2747,7 +2939,18 @@ set mail_check_stats=yes
 # 
 
 
 # 
 
 

-# 3.176. mailcap_path
+# 3.186. mailbox_folder_format
+# 
+# Type: string
+# Default: “%2C %<n?%6n&      > %6m %i”
+# 
+# This variable allows you to customize the file browser display to your personal
+# taste. It's only used to customize network mailboxes (e.g. imap). This string
+# is identical in formatting to the one used by "$folder_format".
+# 
+
+
+# 3.187. mailcap_path

 # 
 # Type: string list
 # Default: “~/.mailcap:/usr/share/neomutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/
 # 
 # Type: string list
 # Default: “~/.mailcap:/usr/share/neomutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/


@@ -2765,7 +2968,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"
 
 
 set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$my_confdir/mailcap.backgrounding:$my_confdir/mailcap.htmldump"
 
 

-# 3.177. mailcap_sanitize
+# 3.188. mailcap_sanitize

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2778,7 +2981,7 @@ set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$
 # 
 
 
 # 
 
 

-# 3.178. maildir_check_cur
+# 3.189. maildir_check_cur

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2791,7 +2994,21 @@ set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$
 # 
 
 
 # 
 
 

-# 3.179. maildir_header_cache_verify
+# 3.190. maildir_field_delimiter
+# 
+# Type: string
+# Default: “:”
+# 
+# Use the value as maildir field delimiter. This is a single-character used to
+# accommodate maildir mailboxes on platforms where `:` is not allowed in a
+# filename. The recommended alternative on such platforms is `;`. Neomutt
+# supports all non-alphanumeric values except for `-`, `.`, ``, `/`. Note: this
+# only applies to maildir-style mailboxes. Setting it will have no effect on
+# other mailbox types.
+# 
+
+
+# 3.191. maildir_header_cache_verify

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2803,7 +3020,7 @@ set mailcap_path="$my_confdir/mailcap.containers:$my_confdir/mailcap.icalendar:$
 set maildir_header_cache_verify=no
 
 
 set maildir_header_cache_verify=no
 
 

-# 3.180. maildir_trash
+# 3.192. maildir_trash

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2814,7 +3031,7 @@ set maildir_header_cache_verify=no
 # 
 
 
 # 
 
 

-# 3.181. mark_macro_prefix
+# 3.193. mark_macro_prefix

 # 
 # Type: string
 # Default: “'”
 # 
 # Type: string
 # Default: “'”


@@ -2825,7 +3042,7 @@ set maildir_header_cache_verify=no
 # 
 
 
 # 
 
 

-# 3.182. mark_old
+# 3.194. mark_old

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2838,7 +3055,7 @@ set maildir_header_cache_verify=no
 set mark_old=no
 
 
 set mark_old=no
 
 

-# 3.183. markers
+# 3.195. markers

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2851,7 +3068,7 @@ set mark_old=no
 set markers=no
 
 
 set markers=no
 
 

-# 3.184. mask
+# 3.196. mask

 # 
 # Type: regular expression
 # Default: “!^.[^.]”
 # 
 # Type: regular expression
 # Default: “!^.[^.]”


@@ -2862,7 +3079,7 @@ set markers=no
 # 
 
 
 # 
 
 

-# 3.185. mbox
+# 3.197. mbox

 # 
 # Type: mailbox
 # Default: “~/mbox”
 # 
 # Type: mailbox
 # Default: “~/mbox”


@@ -2875,7 +3092,7 @@ set markers=no
 set mbox="=spool"
 
 
 set mbox="=spool"
 
 

-# 3.186. mbox_type
+# 3.198. mbox_type

 # 
 # Type: enumeration
 # Default: mbox
 # 
 # Type: enumeration
 # Default: mbox


@@ -2888,7 +3105,7 @@ set mbox="=spool"
 set mbox_type=Maildir
 
 
 set mbox_type=Maildir
 
 

-# 3.187. me_too
+# 3.199. me_too

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2898,7 +3115,7 @@ set mbox_type=Maildir
 # 
 
 
 # 
 
 

-# 3.188. menu_context
+# 3.200. menu_context

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -2909,7 +3126,7 @@ set mbox_type=Maildir
 set menu_context=5
 
 
 set menu_context=5
 
 

-# 3.189. menu_move_off
+# 3.201. menu_move_off

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -2920,7 +3137,7 @@ set menu_context=5
 # 
 
 
 # 
 
 

-# 3.190. menu_scroll
+# 3.202. menu_scroll

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2933,7 +3150,7 @@ set menu_context=5
 set menu_scroll=yes
 
 
 set menu_scroll=yes
 
 

-# 3.191. message_cache_clean
+# 3.203. message_cache_clean

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2944,7 +3161,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.192. message_cachedir
+# 3.204. message_cache_dir

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -2960,7 +3177,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.193. message_format
+# 3.205. message_format

 # 
 # Type: string
 # Default: “%s”
 # 
 # Type: string
 # Default: “%s”


@@ -2971,7 +3188,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.194. meta_key
+# 3.206. meta_key

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2985,7 +3202,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.195. mh_purge
+# 3.207. mh_purge

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -2999,7 +3216,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.196. mh_seq_flagged
+# 3.208. mh_seq_flagged

 # 
 # Type: string
 # Default: “flagged”
 # 
 # Type: string
 # Default: “flagged”


@@ -3008,7 +3225,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.197. mh_seq_replied
+# 3.209. mh_seq_replied

 # 
 # Type: string
 # Default: “replied”
 # 
 # Type: string
 # Default: “replied”


@@ -3017,7 +3234,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.198. mh_seq_unseen
+# 3.210. mh_seq_unseen

 # 
 # Type: string
 # Default: “unseen”
 # 
 # Type: string
 # Default: “unseen”


@@ -3026,7 +3243,7 @@ set menu_scroll=yes
 # 
 
 
 # 
 
 

-# 3.199. mime_forward
+# 3.211. mime_forward

 # 
 # Type: quadoption
 # Default: no
 # 
 # Type: quadoption
 # Default: no


@@ -3042,7 +3259,7 @@ set menu_scroll=yes
 set mime_forward=ask-yes
 
 
 set mime_forward=ask-yes
 
 

-# 3.200. mime_forward_decode
+# 3.212. mime_forward_decode

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3053,7 +3270,7 @@ set mime_forward=ask-yes
 # 
 
 
 # 
 
 

-# 3.201. mime_forward_rest
+# 3.213. mime_forward_rest

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -3064,7 +3281,7 @@ set mime_forward=ask-yes
 # 
 
 
 # 
 
 

-# 3.202. mime_type_query_command
+# 3.214. mime_type_query_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3085,7 +3302,7 @@ set mime_forward=ask-yes
 # 
 
 
 # 
 
 

-# 3.203. mime_type_query_first
+# 3.215. mime_type_query_first

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3095,7 +3312,7 @@ set mime_forward=ask-yes
 # 
 
 
 # 
 
 

-# 3.204. mix_entry_format
+# 3.216. mix_entry_format

 # 
 # Type: string
 # Default: “%4n %c %-16s %a”
 # 
 # Type: string
 # Default: “%4n %c %-16s %a”


@@ -3119,35 +3336,40 @@ set mime_forward=ask-yes
 # │%*X│soft-fill with character "X" as pad                            │
 # └───┴───────────────────────────────────────────────────────────────┘ 
 # 
 # │%*X│soft-fill with character "X" as pad                            │
 # └───┴───────────────────────────────────────────────────────────────┘ 
 # 

+# (Mixmaster only)
+# 

 
 
 
 

-# 3.205. mixmaster
+# 3.217. mixmaster

 # 
 # Type: command
 # Default: “mixmaster”
 # 
 # This variable contains the path to the Mixmaster binary on your system. It is
 # used with various sets of parameters to gather the list of known remailers, and
 # 
 # Type: command
 # Default: “mixmaster”
 # 
 # This variable contains the path to the Mixmaster binary on your system. It is
 # used with various sets of parameters to gather the list of known remailers, and

-# to finally send a message through the mixmaster chain.
+# to finally send a message through the mixmaster chain. (Mixmaster only)

 # 
 # Note: On Debian systems, this option is set by default to “mixmaster-filter” in
 # 
 # Note: On Debian systems, this option is set by default to “mixmaster-filter” in

-# /etc/Muttrc. 
+# /etc/neomuttrc. 

 # 
 set mixmaster="mixmaster-filter"
 
 
 # 
 set mixmaster="mixmaster-filter"
 
 

-# 3.206. move
+# 3.218. move

 # 
 # Type: quadoption
 # Default: no
 # 
 # 
 # Type: quadoption
 # Default: no
 # 

-# Controls whether or not NeoMutt will move read messages from your spool mailbox
-# to your $mbox mailbox, or as a result of a "mbox-hook" command.
+# If this variable is set, then NeoMutt will move read messages from your spool
+# mailbox to your $mbox mailbox or to the "mbox" specified by a mbox-hook
+# command. 
+# 
+# See also $keep_flagged.

 # 
 set move=no
 
 
 # 
 set move=no
 
 

-# 3.207. narrow_tree
+# 3.219. narrow_tree

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3158,7 +3380,7 @@ set move=no
 set narrow_tree=yes
 
 
 set narrow_tree=yes
 
 

-# 3.208. net_inc
+# 3.220. net_inc

 # 
 # Type: number
 # Default: 10
 # 
 # Type: number
 # Default: 10


@@ -3171,7 +3393,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.209. new_mail_command
+# 3.221. new_mail_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3182,7 +3404,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.210. news_cache_dir
+# 3.222. news_cache_dir

 # 
 # Type: path
 # Default: “~/.neomutt”
 # 
 # Type: path
 # Default: “~/.neomutt”


@@ -3193,7 +3415,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.211. news_server
+# 3.223. news_server

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3208,7 +3430,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.212. newsgroups_charset
+# 3.224. newsgroups_charset

 # 
 # Type: string
 # Default: “utf-8”
 # 
 # Type: string
 # Default: “utf-8”


@@ -3217,7 +3439,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.213. newsrc
+# 3.225. newsrc

 # 
 # Type: path
 # Default: “~/.newsrc”
 # 
 # Type: path
 # Default: “~/.newsrc”


@@ -3243,7 +3465,25 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.214. nm_db_limit
+# 3.226. nm_config_file
+# 
+# Type: path
+# Default: “auto”
+# 
+# Configuration file for notmuch. Use 'auto' to detect configuration.
+# 
+
+
+# 3.227. nm_config_profile
+# 
+# Type: string
+# Default: (empty)
+# 
+# Configuration profile for notmuch.
+# 
+
+
+# 3.228. nm_db_limit

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3252,7 +3492,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.215. nm_default_url
+# 3.229. nm_default_url

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3260,10 +3500,9 @@ set narrow_tree=yes
 # This variable specifies the default Notmuch database in format notmuch://
 # <absolute path>.
 # 
 # This variable specifies the default Notmuch database in format notmuch://
 # <absolute path>.
 # 

-#set nm_default_url="notmuch://$HOME/nmmail"

 
 
 
 

-# 3.216. nm_exclude_tags
+# 3.230. nm_exclude_tags

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3273,7 +3512,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.217. nm_flagged_tag
+# 3.231. nm_flagged_tag

 # 
 # Type: string
 # Default: “flagged”
 # 
 # Type: string
 # Default: “flagged”


@@ -3284,7 +3523,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.218. nm_open_timeout
+# 3.232. nm_open_timeout

 # 
 # Type: number
 # Default: 5
 # 
 # Type: number
 # Default: 5


@@ -3293,7 +3532,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.219. nm_query_type
+# 3.233. nm_query_type

 # 
 # Type: string
 # Default: “messages”
 # 
 # Type: string
 # Default: “messages”


@@ -3301,10 +3540,9 @@ set narrow_tree=yes
 # This variable specifies the default query type (threads or messages) used in
 # notmuch queries.
 # 
 # This variable specifies the default query type (threads or messages) used in
 # notmuch queries.
 # 

-#set nm_query_type="threads"

 
 
 
 

-# 3.220. nm_query_window_current_position
+# 3.234. nm_query_window_current_position

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3314,7 +3552,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.221. nm_query_window_current_search
+# 3.235. nm_query_window_current_search

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3324,7 +3562,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.222. nm_query_window_duration
+# 3.236. nm_query_window_duration

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3332,20 +3570,18 @@ set narrow_tree=yes
 # This variable sets the time duration of a windowed notmuch query. Accepted
 # values all non negative integers. A value of 0 disables the feature.
 # 
 # This variable sets the time duration of a windowed notmuch query. Accepted
 # values all non negative integers. A value of 0 disables the feature.
 # 

-#set nm_query_window_duration=2

 
 
 
 

-# 3.223. nm_query_window_enable
+# 3.237. nm_query_window_enable

 # 
 # Type: boolean
 # Default: no
 # 
 # This variable enables windowed notmuch queries even if window duration is 0.
 # 
 # 
 # Type: boolean
 # Default: no
 # 
 # This variable enables windowed notmuch queries even if window duration is 0.
 # 

-#set nm_query_window_enable=yes

 
 
 
 

-# 3.224. nm_query_window_or_terms
+# 3.238. nm_query_window_or_terms

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3360,10 +3596,9 @@ set narrow_tree=yes
 # 
 # notmuch://?query=tag:inbox and (date:... or (tag:flagged and tag:unread))
 # 
 # 
 # notmuch://?query=tag:inbox and (date:... or (tag:flagged and tag:unread))
 # 

-#set nm_query_window_or_terms="tag:unread and tag:flagged"

 
 
 
 

-# 3.225. nm_query_window_timebase
+# 3.239. nm_query_window_timebase

 # 
 # Type: string
 # Default: “week”
 # 
 # Type: string
 # Default: “week”


@@ -3373,7 +3608,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.226. nm_record
+# 3.240. nm_record

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3383,10 +3618,9 @@ set narrow_tree=yes
 # the notmuch tags from the original message. See $nm_record_tags for how to
 # modify the set of notmuch tags assigned to sent messages written to the record.
 # 
 # the notmuch tags from the original message. See $nm_record_tags for how to
 # modify the set of notmuch tags assigned to sent messages written to the record.
 # 

-#set nm_record=yes

 
 
 
 

-# 3.227. nm_record_tags
+# 3.241. nm_record_tags

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3395,10 +3629,9 @@ set narrow_tree=yes
 # toggling) applied to messages added to the Neomutt record when $nm_record is
 # true. See the description of the <modify-labels> function for the syntax.
 # 
 # toggling) applied to messages added to the Neomutt record when $nm_record is
 # true. See the description of the <modify-labels> function for the syntax.
 # 

-#set nm_record_tags="-unread,reply,archive"

 
 
 
 

-# 3.228. nm_replied_tag
+# 3.242. nm_replied_tag

 # 
 # Type: string
 # Default: “replied”
 # 
 # Type: string
 # Default: “replied”


@@ -3409,18 +3642,18 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.229. nm_unread_tag
+# 3.243. nm_unread_tag

 # 
 # Type: string
 # Default: “unread”
 # 
 # This variable specifies notmuch tag which is used for unread messages. The
 # variable is used to count unread messages in DB and set the unread flag when
 # 
 # Type: string
 # Default: “unread”
 # 
 # This variable specifies notmuch tag which is used for unread messages. The
 # variable is used to count unread messages in DB and set the unread flag when

-# modifiying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
+# modifying tags. All other NeoMutt commands use standard (e.g. maildir) flags.

 # 
 
 
 # 
 
 

-# 3.230. nntp_authenticators
+# 3.244. nntp_authenticators

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3442,9 +3675,9 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.231. nntp_context
+# 3.245. nntp_context

 # 
 # 

-# Type: number
+# Type: number (long)

 # Default: 1000
 # 
 # This variable defines number of articles which will be in index when newsgroup
 # Default: 1000
 # 
 # This variable defines number of articles which will be in index when newsgroup


@@ -3454,7 +3687,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.232. nntp_listgroup
+# 3.246. nntp_listgroup

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -3464,7 +3697,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.233. nntp_load_description
+# 3.247. nntp_load_description

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -3475,7 +3708,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.234. nntp_pass
+# 3.248. nntp_pass

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3484,7 +3717,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.235. nntp_poll
+# 3.249. nntp_poll

 # 
 # Type: number
 # Default: 60
 # 
 # Type: number
 # Default: 60


@@ -3495,7 +3728,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.236. nntp_user
+# 3.250. nntp_user

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3506,13 +3739,13 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.237. pager
+# 3.251. pager

 # 
 # Type: command
 # 
 # Type: command

-# Default: “builtin”
+# Default: (empty)

 # 
 # 

-# This variable specifies which pager you would like to use to view messages. The
-# value "builtin" means to use the built-in pager, otherwise this variable should
+# This variable specifies which pager you would like to use to view messages.
+# When empty, NeoMutt will use the built-in pager, otherwise this variable should

 # specify the pathname of the external pager you would like to use.
 # 
 # Using an external pager may have some disadvantages: Additional keystrokes are
 # specify the pathname of the external pager you would like to use.
 # 
 # Using an external pager may have some disadvantages: Additional keystrokes are


@@ -3522,7 +3755,7 @@ set narrow_tree=yes
 # 
 
 
 # 
 
 

-# 3.238. pager_context
+# 3.252. pager_context

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3539,7 +3772,7 @@ set narrow_tree=yes
 set pager_context=2
 
 
 set pager_context=2
 
 

-# 3.239. pager_format
+# 3.253. pager_format

 # 
 # Type: string
 # Default: “-%Z- %C/%m: %-20.20n   %s%*  -- (%P)”
 # 
 # Type: string
 # Default: “-%Z- %C/%m: %-20.20n   %s%*  -- (%P)”


@@ -3551,7 +3784,7 @@ set pager_context=2
 set pager_format="<%a> %*  %i (%P)"
 
 
 set pager_format="<%a> %*  %i (%P)"
 
 

-# 3.240. pager_index_lines
+# 3.254. pager_index_lines

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3561,14 +3794,12 @@ set pager_format="<%a> %*  %i (%P)"
 # be roughly one third of the way down this mini-index, giving the reader the
 # context of a few messages before and after the message. This is useful, for
 # example, to determine how many messages remain to be read in the current
 # be roughly one third of the way down this mini-index, giving the reader the
 # context of a few messages before and after the message. This is useful, for
 # example, to determine how many messages remain to be read in the current

-# thread. A value of 0 results in no index being shown. If the number of messages
-# in the current folder is less than $pager_index_lines, then the index will only
-# use as many lines as it needs.
+# thread. A value of 0 results in no index being shown.

 # 
 set pager_index_lines=$menu_context
 
 
 # 
 set pager_index_lines=$menu_context
 
 

-# 3.241. pager_read_delay
+# 3.255. pager_read_delay

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3577,12 +3808,11 @@ set pager_index_lines=$menu_context
 # message in the pager before that message will be marked as read. A value of 0
 # results in the message being marked read unconditionally; for other values,
 # navigating to another message or exiting the pager before the timeout will
 # message in the pager before that message will be marked as read. A value of 0
 # results in the message being marked read unconditionally; for other values,
 # navigating to another message or exiting the pager before the timeout will

-# leave the message marked unread. This setting is ignored if $pager is not
-# builtin. 
+# leave the message marked unread. This setting is ignored if $pager is set.

 # 
 
 
 # 
 
 

-# 3.242. pager_skip_quoted_context
+# 3.256. pager_skip_quoted_context

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -3597,7 +3827,7 @@ set pager_index_lines=$menu_context
 # 
 
 
 # 
 
 

-# 3.243. pager_stop
+# 3.257. pager_stop

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3608,7 +3838,7 @@ set pager_index_lines=$menu_context
 set pager_stop=yes
 
 
 set pager_stop=yes
 
 

-# 3.244. pattern_format
+# 3.258. pattern_format

 # 
 # Type: string
 # Default: “%2n %-15e  %d”
 # 
 # Type: string
 # Default: “%2n %-15e  %d”


@@ -3616,17 +3846,23 @@ set pager_stop=yes
 # This variable describes the format of the "pattern completion" menu. The
 # following printf(3)-style sequences are understood:
 # 
 # This variable describes the format of the "pattern completion" menu. The
 # following printf(3)-style sequences are understood:
 # 

-# ┌──┬────────────────────┐ 
-# │%d│pattern description │
-# ├──┼────────────────────┤ 
-# │%e│pattern expression  │
-# ├──┼────────────────────┤ 
-# │%n│index number        │
-# └──┴────────────────────┘ 
+# ┌───┬───────────────────────────────────────────────────────────────┐ 
+# │%d │pattern description                                            │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%e │pattern expression                                             │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%n │index number                                                   │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%>X│right justify the rest of the string and pad with character "X"│
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%|X│pad to the end of the line with character "X"                  │
+# ├───┼───────────────────────────────────────────────────────────────┤ 
+# │%*X│soft-fill with character "X" as pad                            │
+# └───┴───────────────────────────────────────────────────────────────┘ 

 # 
 
 
 # 
 
 

-# 3.245. pgp_auto_decode
+# 3.259. pgp_auto_decode

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3640,7 +3876,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.246. pgp_auto_inline
+# 3.260. pgp_auto_inline

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3661,7 +3897,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.247. pgp_check_exit
+# 3.261. pgp_check_exit

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -3671,7 +3907,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.248. pgp_check_gpg_decrypt_status_fd
+# 3.262. pgp_check_gpg_decrypt_status_fd

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -3687,7 +3923,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.249. pgp_clear_sign_command
+# 3.263. pgp_clear_sign_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3702,7 +3938,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.250. pgp_decode_command
+# 3.264. pgp_decode_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3718,7 +3954,7 @@ set pager_stop=yes
 # │%f│Expands to the name of a file containing a message.                       │
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # │%p│Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty string   │
 # │%f│Expands to the name of a file containing a message.                       │
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # │%p│Expands to PGPPASSFD=0 when a pass phrase is needed, to an empty string   │

-# │ │otherwise. Note: This may be used with a %? construct.                    │
+# │ │otherwise. Note: This may be used with a %<...> construct.                │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # │%r│One or more key IDs (or fingerprints if available).                       │
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # │%r│One or more key IDs (or fingerprints if available).                       │
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 


@@ -3726,14 +3962,11 @@ set pager_stop=yes
 # │ │/signed attachment when verifying it.                                     │
 # └──┴──────────────────────────────────────────────────────────────────────────┘ 
 # 
 # │ │/signed attachment when verifying it.                                     │
 # └──┴──────────────────────────────────────────────────────────────────────────┘ 
 # 

-# For examples on how to configure these formats for the various versions of PGP
-# which are floating around, see the pgp and gpg sample configuration files in
-# the samples/ subdirectory which has been installed on your system alongside the
-# documentation. (PGP only)
+# (PGP only)

 # 
 
 
 # 
 
 

-# 3.251. pgp_decrypt_command
+# 3.265. pgp_decrypt_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3753,7 +3986,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.252. pgp_decryption_okay
+# 3.266. pgp_decryption_okay

 # 
 # Type: regular expression
 # Default: (empty)
 # 
 # Type: regular expression
 # Default: (empty)


@@ -3769,7 +4002,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.253. pgp_default_key
+# 3.267. pgp_default_key

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -3784,7 +4017,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.254. pgp_encrypt_only_command
+# 3.268. pgp_encrypt_only_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3798,7 +4031,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.255. pgp_encrypt_sign_command
+# 3.269. pgp_encrypt_sign_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3810,7 +4043,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.256. pgp_entry_format
+# 3.270. pgp_entry_format

 # 
 # Type: string
 # Default: “%4n %t%f %4l/0x%k %-4a %2c %u”
 # 
 # Type: string
 # Default: “%4n %t%f %4l/0x%k %-4a %2c %u”


@@ -3820,33 +4053,44 @@ set pager_stop=yes
 # selection menu also. This string is similar to $index_format, but has its own
 # set of printf(3)-like sequences:
 # 
 # selection menu also. This string is similar to $index_format, but has its own
 # set of printf(3)-like sequences:
 # 

-# ┌──────┬──────────────────────────────────────────────────────┐ 
-# │%a │Algorithm                                             │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%c │Capabilities                                          │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%f │Flags                                                 │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%k │Key id                                                │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%l │Key length                                            │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%n │Number                                                │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%p │Protocol                                              │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%t │Trust/validity of the key-uid association             │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%u │User id                                               │
-# ├──────┼──────────────────────────────────────────────────────┤ 
-# │%[<s>]│Date of the key where <s> is an strftime(3) expression│
-# └──────┴──────────────────────────────────────────────────────┘ 
+# ┌──────┬───────────────────────────────────────────────────────────────┐ 
+# │%a │Algorithm                                                      │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%c │Capabilities                                                   │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%f │Flags                                                          │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%i │Key fingerprint (or long key id if non-existent)               │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%k │Key id                                                         │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%l │Key length                                                     │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%n │Number                                                         │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%p │Protocol                                                       │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%t │Trust/validity of the key-uid association                      │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%u │User id                                                        │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%[<s>]│Date of the key where <s> is an strftime(3) expression         │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%>X │Right justify the rest of the string and pad with character "X"│
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%|X │Pad to the end of the line with character "X"                  │
+# ├──────┼───────────────────────────────────────────────────────────────┤ 
+# │%*X │Soft-fill with character "X" as pad                            │
+# └──────┴───────────────────────────────────────────────────────────────┘ 
+# 
+# See the section "Sending Cryptographically Signed/Encrypted Messages" of the
+# user manual for the meaning of the letters some of these sequences expand to.

 # 
 # (Crypto only) or (PGP only when GPGME disabled)
 # 
 
 
 # 
 # (Crypto only) or (PGP only when GPGME disabled)
 # 
 
 

-# 3.257. pgp_export_command
+# 3.271. pgp_export_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3858,7 +4102,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.258. pgp_get_keys_command
+# 3.272. pgp_get_keys_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3872,7 +4116,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.259. pgp_good_sign
+# 3.273. pgp_good_sign

 # 
 # Type: regular expression
 # Default: (empty)
 # 
 # Type: regular expression
 # Default: (empty)


@@ -3884,7 +4128,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.260. pgp_ignore_subkeys
+# 3.274. pgp_ignore_subkeys

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -3895,7 +4139,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.261. pgp_import_command
+# 3.275. pgp_import_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3908,7 +4152,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.262. pgp_list_pubring_command
+# 3.276. pgp_list_pubring_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3926,7 +4170,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.263. pgp_list_secring_command
+# 3.277. pgp_list_secring_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -3944,7 +4188,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.264. pgp_long_ids
+# 3.278. pgp_long_ids

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -3956,7 +4200,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.265. pgp_mime_auto
+# 3.279. pgp_mime_auto

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -3970,7 +4214,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.266. pgp_reply_inline
+# 3.280. pgp_reply_inline

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -3993,7 +4237,7 @@ set pager_stop=yes
 # 
 
 
 # 
 
 

-# 3.267. pgp_retainable_sigs
+# 3.281. pgp_retainable_sigs

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4008,7 +4252,7 @@ set pager_stop=yes
 set pgp_retainable_sigs=yes
 
 
 set pgp_retainable_sigs=yes
 
 

-# 3.268. pgp_self_encrypt
+# 3.282. pgp_self_encrypt

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4018,7 +4262,7 @@ set pgp_retainable_sigs=yes
 # 
 
 
 # 
 
 

-# 3.269. pgp_show_unusable
+# 3.283. pgp_show_unusable

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4030,7 +4274,7 @@ set pgp_retainable_sigs=yes
 set pgp_show_unusable=no
 
 
 set pgp_show_unusable=no
 
 

-# 3.270. pgp_sign_as
+# 3.284. pgp_sign_as

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4043,7 +4287,7 @@ set pgp_show_unusable=no
 set pgp_sign_as="0x9C9D6979AE941637"
 
 
 set pgp_sign_as="0x9C9D6979AE941637"
 
 

-# 3.271. pgp_sign_command
+# 3.285. pgp_sign_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -4056,7 +4300,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
 # 
 
 

-# 3.272. pgp_sort_keys
+# 3.286. pgp_sort_keys

 # 
 # Type: sort order
 # Default: address
 # 
 # Type: sort order
 # Default: address


@@ -4079,7 +4323,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
 # 
 
 

-# 3.273. pgp_strict_enc
+# 3.287. pgp_strict_enc

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4091,7 +4335,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
 # 
 
 

-# 3.274. pgp_timeout
+# 3.288. pgp_timeout

 # 
 # Type: number (long)
 # Default: 300
 # 
 # Type: number (long)
 # Default: 300


@@ -4101,7 +4345,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 # 
 
 
 # 
 
 

-# 3.275. pgp_use_gpg_agent
+# 3.289. pgp_use_gpg_agent

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4124,7 +4368,7 @@ set pgp_sign_as="0x9C9D6979AE941637"
 set pgp_use_gpg_agent=yes
 
 
 set pgp_use_gpg_agent=yes
 
 

-# 3.276. pgp_verify_command
+# 3.290. pgp_verify_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -4136,7 +4380,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.277. pgp_verify_key_command
+# 3.291. pgp_verify_key_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -4148,7 +4392,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.278. pipe_decode
+# 3.292. pipe_decode

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4162,7 +4406,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.279. pipe_decode_weed
+# 3.293. pipe_decode_weed

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4172,7 +4416,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.280. pipe_sep
+# 3.294. pipe_sep

 # 
 # Type: string
 # Default: “n”
 # 
 # Type: string
 # Default: “n”


@@ -4182,7 +4426,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.281. pipe_split
+# 3.295. pipe_split

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4195,7 +4439,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.282. pop_auth_try_all
+# 3.296. pop_auth_try_all

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4207,7 +4451,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.283. pop_authenticators
+# 3.297. pop_authenticators

 # 
 # Type: string list
 # Default: (empty)
 # 
 # Type: string list
 # Default: (empty)


@@ -4225,7 +4469,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.284. pop_check_interval
+# 3.298. pop_check_interval

 # 
 # Type: number
 # Default: 60
 # 
 # Type: number
 # Default: 60


@@ -4235,7 +4479,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.285. pop_delete
+# 3.299. pop_delete

 # 
 # Type: quadoption
 # Default: ask-no
 # 
 # Type: quadoption
 # Default: ask-no


@@ -4246,7 +4490,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.286. pop_host
+# 3.300. pop_host

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4260,7 +4504,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.287. pop_last
+# 3.301. pop_last

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4271,7 +4515,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.288. pop_oauth_refresh_command
+# 3.302. pop_oauth_refresh_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -4283,7 +4527,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.289. pop_pass
+# 3.303. pop_pass

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4297,7 +4541,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.290. pop_reconnect
+# 3.304. pop_reconnect

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -4307,7 +4551,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.291. pop_user
+# 3.305. pop_user

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4318,17 +4562,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.292. post_indent_string
-# 
-# Type: string
-# Default: (empty)
-# 
-# Similar to the $attribution variable, NeoMutt will append this string after the
-# inclusion of a message which is being replied to.
-# 
-
-
-# 3.293. post_moderated
+# 3.306. post_moderated

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -4339,7 +4573,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.294. postpone
+# 3.307. postpone

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -4353,7 +4587,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.295. postpone_encrypt
+# 3.308. postpone_encrypt

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4365,7 +4599,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.296. postpone_encrypt_as
+# 3.309. postpone_encrypt_as

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4375,7 +4609,7 @@ set pgp_use_gpg_agent=yes
 # 
 
 
 # 
 
 

-# 3.297. postponed
+# 3.310. postponed

 # 
 # Type: mailbox
 # Default: “~/postponed”
 # 
 # Type: mailbox
 # Default: “~/postponed”


@@ -4389,7 +4623,7 @@ set pgp_use_gpg_agent=yes
 set postponed="=drafts"
 
 
 set postponed="=drafts"
 
 

-# 3.298. preconnect
+# 3.311. preconnect

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4408,7 +4642,7 @@ set postponed="=drafts"
 # 
 
 
 # 
 
 

-# 3.299. preferred_languages
+# 3.312. preferred_languages

 # 
 # Type: string list
 # Default: (empty)
 # 
 # Type: string list
 # Default: (empty)


@@ -4420,7 +4654,7 @@ set postponed="=drafts"
 # 
 
 
 # 
 
 

-# 3.300. print
+# 3.313. print

 # 
 # Type: quadoption
 # Default: ask-no
 # 
 # Type: quadoption
 # Default: ask-no


@@ -4430,7 +4664,7 @@ set postponed="=drafts"
 # 
 
 
 # 
 
 

-# 3.301. print_command
+# 3.314. print_command

 # 
 # Type: command
 # Default: “lpr”
 # 
 # Type: command
 # Default: “lpr”


@@ -4440,7 +4674,7 @@ set postponed="=drafts"
 set print_command="muttprint"
 
 
 set print_command="muttprint"
 
 

-# 3.302. print_decode
+# 3.315. print_decode

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4457,7 +4691,7 @@ set print_command="muttprint"
 # 
 
 
 # 
 
 

-# 3.303. print_decode_weed
+# 3.316. print_decode_weed

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4467,7 +4701,7 @@ set print_command="muttprint"
 # 
 
 
 # 
 
 

-# 3.304. print_split
+# 3.317. print_split

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4484,7 +4718,7 @@ set print_command="muttprint"
 set print_split=yes
 
 
 set print_split=yes
 
 

-# 3.305. prompt_after
+# 3.318. prompt_after

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4496,7 +4730,7 @@ set print_split=yes
 # 
 
 
 # 
 
 

-# 3.306. query_command
+# 3.319. query_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -4512,7 +4746,7 @@ set print_split=yes
 set query_command="lbdbq"
 
 
 set query_command="lbdbq"
 
 

-# 3.307. query_format
+# 3.320. query_format

 # 
 # Type: string
 # Default: “%3c %t %-25.25n %-25.25a | %e”
 # 
 # Type: string
 # Default: “%3c %t %-25.25n %-25.25a | %e”


@@ -4531,6 +4765,8 @@ set query_command="lbdbq"
 # ├───┼─┼─────────────────────────────────────────────────────┤ 
 # │%t │ │"*" if current entry is tagged, a space otherwise    │
 # ├───┼─┼─────────────────────────────────────────────────────┤ 
 # ├───┼─┼─────────────────────────────────────────────────────┤ 
 # │%t │ │"*" if current entry is tagged, a space otherwise    │
 # ├───┼─┼─────────────────────────────────────────────────────┤ 

+# │%Y │ │Comma-separated tags                                 │
+# ├───┼─┼─────────────────────────────────────────────────────┤ 

 # │%>X│ │Right justify the rest of the string and pad with "X"│
 # ├───┼─┼─────────────────────────────────────────────────────┤ 
 # │%|X│ │Pad to the end of the line with "X"                  │
 # │%>X│ │Right justify the rest of the string and pad with "X"│
 # ├───┼─┼─────────────────────────────────────────────────────┤ 
 # │%|X│ │Pad to the end of the line with "X"                  │


@@ -4544,7 +4780,7 @@ set query_command="lbdbq"
 # 
 
 
 # 
 
 

-# 3.308. quit
+# 3.321. quit

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -4554,9 +4790,13 @@ set query_command="lbdbq"
 # it is set to ask-yes or ask-no, you are prompted for confirmation when you try
 # to quit.
 # 
 # it is set to ask-yes or ask-no, you are prompted for confirmation when you try
 # to quit.
 # 

+# In order to quit from NeoMutt if this variable is unset, you must send the
+# signal SIGINT to NeoMutt. This can usually be achieved by pressing CTRL-C in
+# the terminal.
+# 

 
 
 
 

-# 3.309. quote_regex
+# 3.322. quote_regex

 # 
 # Type: regular expression
 # Default: “^([ t]*[|>:}#])+”
 # 
 # Type: regular expression
 # Default: “^([ t]*[|>:}#])+”


@@ -4575,7 +4815,7 @@ set query_command="lbdbq"
 # 
 
 
 # 
 
 

-# 3.310. read_inc
+# 3.323. read_inc

 # 
 # Type: number
 # Default: 10
 # 
 # Type: number
 # Default: 10


@@ -4594,7 +4834,7 @@ set query_command="lbdbq"
 # 
 
 
 # 
 
 

-# 3.311. read_only
+# 3.324. read_only

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4603,7 +4843,7 @@ set query_command="lbdbq"
 # 
 
 
 # 
 
 

-# 3.312. real_name
+# 3.325. real_name

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -4616,7 +4856,7 @@ set query_command="lbdbq"
 # 
 
 
 # 
 
 

-# 3.313. recall
+# 3.326. recall

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -4633,7 +4873,7 @@ set query_command="lbdbq"
 set recall=no
 
 
 set recall=no
 
 

-# 3.314. record
+# 3.327. record

 # 
 # Type: mailbox
 # Default: “~/sent”
 # 
 # Type: mailbox
 # Default: “~/sent”


@@ -4649,7 +4889,7 @@ set recall=no
 set record="=store"
 
 
 set record="=store"
 
 

-# 3.315. reflow_space_quotes
+# 3.328. reflow_space_quotes

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4663,7 +4903,7 @@ set record="=store"
 # 
 
 
 # 
 
 

-# 3.316. reflow_text
+# 3.329. reflow_text

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4677,7 +4917,7 @@ set record="=store"
 # 
 
 
 # 
 
 

-# 3.317. reflow_wrap
+# 3.330. reflow_wrap

 # 
 # Type: number
 # Default: 78
 # 
 # Type: number
 # Default: 78


@@ -4688,23 +4928,51 @@ set record="=store"
 # relative to the left margin. A negative value set the paragraph width relative
 # to the right margin.
 # 
 # relative to the left margin. A negative value set the paragraph width relative
 # to the right margin.
 # 

+# Be aware that the reformatted lines of a paragraph are still subject to $wrap.
+# This means if $reflow_wrap is 40 and $wrap is 30, then the paragraph gets
+# reformatted to 40 characters a line (due to $reflow_wrap) and afterwards each
+# 40-character-line is split at 30 characters (due to $wrap), resulting in
+# alternating line lengths of 30 and 10 characters.
+# 

 # Also see $wrap.
 # 
 set reflow_wrap=-10
 
 
 # Also see $wrap.
 # 
 set reflow_wrap=-10
 
 

-# 3.318. reply_regex
+# 3.331. reply_regex

 # 
 # Type: regular expression
 # Default: “^((re|aw|sv)([[0-9]+])*:[ t]*)*”
 # 
 # A regular expression used to recognize reply messages when threading and
 # 
 # Type: regular expression
 # Default: “^((re|aw|sv)([[0-9]+])*:[ t]*)*”
 # 
 # A regular expression used to recognize reply messages when threading and

-# replying. The default value corresponds to the English "Re:", the German "Aw:"
-# and the Swedish "Sv:".
+# replying. The default value corresponds to the standard Latin "Re:" prefix.
+# 
+# This value may have been localized by the translator for your locale, adding
+# other prefixes that are common in the locale. You can add your own prefixes by
+# appending inside "^(re)". For example: "^(re|sv)" or "^(re|aw|sv)".
+# 
+# The second parenthesized expression matches zero or more bracketed numbers
+# following the prefix, such as "Re[1]: ". The initial "\[" means a literal
+# left-bracket character. Note the backslash must be doubled when used inside a
+# double quoted string in the neomuttrc. "[0-9]+" means one or more numbers. "\]
+# " means a literal right-bracket. Finally the whole parenthesized expression has
+# a "*" suffix, meaning it can occur zero or more times.
+# 
+# The last part matches a colon followed by an optional space or tab. Note "t"
+# is converted to a literal tab inside a double quoted string. If you use a
+# single quoted string, you would have to type an actual tab character, and would
+# need to convert the double-backslashes to single backslashes.
+# 
+# Note: the result of this regex match against the subject is stored in the
+# header cache. Mutt isn't smart enough to invalidate a header cache entry based
+# on changing $reply_regex, so if you aren't seeing correct values in the index,
+# try temporarily turning off the header cache. If that fixes the problem, then
+# once the variable is set to your liking, remove your stale header cache files
+# and turn the header cache back on.

 # 
 
 
 # 
 
 

-# 3.319. reply_self
+# 3.332. reply_self

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4717,7 +4985,7 @@ set reflow_wrap=-10
 # 
 
 
 # 
 
 

-# 3.320. reply_to
+# 3.333. reply_to

 # 
 # Type: quadoption
 # Default: ask-yes
 # 
 # Type: quadoption
 # Default: ask-yes


@@ -4730,7 +4998,7 @@ set reflow_wrap=-10
 # 
 
 
 # 
 
 

-# 3.321. reply_with_xorig
+# 3.334. reply_with_xorig

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4744,18 +5012,21 @@ set reflow_wrap=-10
 # 
 
 
 # 
 
 

-# 3.322. resolve
+# 3.335. resolve

 # 
 # Type: boolean
 # Default: yes
 # 
 # 
 # Type: boolean
 # Default: yes
 # 

-# When set, the cursor will be automatically advanced to the next (possibly
-# undeleted) message whenever a command that modifies the current message is
-# executed. 
+# When set, the cursor in a list will be automatically advanced to the next
+# (possibly undeleted) message/attachment/entry whenever a command that modifies
+# the current message/attachment/entry is executed.
+# 
+# Examples of such commands are tagging a message, deleting an entry, or saving
+# an attachment.

 # 
 
 
 # 
 
 

-# 3.323. resume_draft_files
+# 3.336. resume_draft_files

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4767,7 +5038,7 @@ set reflow_wrap=-10
 # 
 
 
 # 
 
 

-# 3.324. resume_edited_draft_files
+# 3.337. resume_edited_draft_files

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4784,7 +5055,7 @@ set reflow_wrap=-10
 # 
 
 
 # 
 
 

-# 3.325. reverse_alias
+# 3.338. reverse_alias

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4805,7 +5076,7 @@ set reflow_wrap=-10
 # 
 
 
 # 
 
 

-# 3.326. reverse_name
+# 3.339. reverse_name

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4823,7 +5094,7 @@ set reflow_wrap=-10
 set reverse_name=yes
 
 
 set reverse_name=yes
 
 

-# 3.327. reverse_real_name
+# 3.340. reverse_real_name

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4841,10 +5112,10 @@ set reverse_name=yes
 # 
 
 
 # 
 
 

-# 3.328. rfc2047_parameters
+# 3.341. rfc2047_parameters

 # 
 # Type: boolean
 # 
 # Type: boolean

-# Default: no
+# Default: yes

 # 
 # When this variable is set, NeoMutt will decode RFC2047-encoded MIME parameters.
 # You want to set this variable when NeoMutt suggests you to save attachments to
 # 
 # When this variable is set, NeoMutt will decode RFC2047-encoded MIME parameters.
 # You want to set this variable when NeoMutt suggests you to save attachments to


@@ -4867,7 +5138,7 @@ set reverse_name=yes
 set rfc2047_parameters=yes
 
 
 set rfc2047_parameters=yes
 
 

-# 3.329. save_address
+# 3.342. save_address

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4878,7 +5149,7 @@ set rfc2047_parameters=yes
 # 
 
 
 # 
 
 

-# 3.330. save_empty
+# 3.343. save_empty

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4892,7 +5163,7 @@ set rfc2047_parameters=yes
 # 
 
 
 # 
 
 

-# 3.331. save_history
+# 3.344. save_history

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -4900,10 +5171,14 @@ set rfc2047_parameters=yes
 # This variable controls the size of the history (per category) saved in the
 # $history_file file.
 # 
 # This variable controls the size of the history (per category) saved in the
 # $history_file file.
 # 

+# Setting this to a value greater than $history is possible. However, there will
+# never be more than $history entries to select from even if more are recorded in
+# the history file.
+# 

 set save_history=100
 
 
 set save_history=100
 
 

-# 3.332. save_name
+# 3.345. save_name

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4919,7 +5194,7 @@ set save_history=100
 # 
 
 
 # 
 
 

-# 3.333. save_unsubscribed
+# 3.346. save_unsubscribed

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -4929,7 +5204,7 @@ set save_history=100
 # 
 
 
 # 
 
 

-# 3.334. score
+# 3.347. score

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -4940,7 +5215,7 @@ set save_history=100
 # 
 
 
 # 
 
 

-# 3.335. score_threshold_delete
+# 3.348. score_threshold_delete

 # 
 # Type: number
 # Default: -1
 # 
 # Type: number
 # Default: -1


@@ -4952,7 +5227,7 @@ set save_history=100
 # 
 
 
 # 
 
 

-# 3.336. score_threshold_flag
+# 3.349. score_threshold_flag

 # 
 # Type: number
 # Default: 9999
 # 
 # Type: number
 # Default: 9999


@@ -4962,7 +5237,7 @@ set save_history=100
 # 
 
 
 # 
 
 

-# 3.337. score_threshold_read
+# 3.350. score_threshold_read

 # 
 # Type: number
 # Default: -1
 # 
 # Type: number
 # Default: -1


@@ -4974,7 +5249,7 @@ set save_history=100
 # 
 
 
 # 
 
 

-# 3.338. search_context
+# 3.351. search_context

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -4985,9 +5260,9 @@ set save_history=100
 set search_context=5
 
 
 set search_context=5
 
 

-# 3.339. send_charset
+# 3.352. send_charset

 # 
 # 

-# Type: string
+# Type: string list

 # Default: “us-ascii:iso-8859-1:utf-8”
 # 
 # A colon-delimited list of character sets for outgoing messages. NeoMutt will
 # Default: “us-ascii:iso-8859-1:utf-8”
 # 
 # A colon-delimited list of character sets for outgoing messages. NeoMutt will


@@ -5003,7 +5278,7 @@ set search_context=5
 set send_charset="utf-8"
 
 
 set send_charset="utf-8"
 
 

-# 3.340. sendmail
+# 3.353. sendmail

 # 
 # Type: command
 # Default: “/usr/sbin/sendmail -oem -oi”
 # 
 # Type: command
 # Default: “/usr/sbin/sendmail -oem -oi”


@@ -5015,12 +5290,17 @@ set send_charset="utf-8"
 # $use_envelope_from, $dsn_notify, or $dsn_return will be added before the
 # delimiter. 
 # 
 # $use_envelope_from, $dsn_notify, or $dsn_return will be added before the
 # delimiter. 
 # 

+# Note: This command is invoked differently from most other commands in NeoMutt.
+# It is tokenized by space, and invoked directly via execvp(3) with an array of
+# arguments - so commands or arguments with spaces in them are not supported. The
+# shell is not used to run the command, so shell quoting is also not supported.
+# 

 # See also: $write_bcc.
 # 
 set sendmail="$my_confdir/sendmail"
 
 
 # See also: $write_bcc.
 # 
 set sendmail="$my_confdir/sendmail"
 
 

-# 3.341. sendmail_wait
+# 3.354. sendmail_wait

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -5044,7 +5324,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.342. shell
+# 3.355. shell

 # 
 # Type: command
 # Default: “/bin/sh”
 # 
 # Type: command
 # Default: “/bin/sh”


@@ -5054,7 +5334,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.343. show_multipart_alternative
+# 3.356. show_multipart_alternative

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -5065,7 +5345,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.344. show_new_news
+# 3.357. show_new_news

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5076,7 +5356,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.345. show_only_unread
+# 3.358. show_only_unread

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5086,7 +5366,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.346. sidebar_component_depth
+# 3.359. sidebar_component_depth

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -5101,7 +5381,7 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.347. sidebar_delim_chars
+# 3.360. sidebar_delim_chars

 # 
 # Type: string
 # Default: “/.”
 # 
 # Type: string
 # Default: “/.”


@@ -5121,19 +5401,25 @@ set sendmail="$my_confdir/sendmail"
 # 
 
 
 # 
 
 

-# 3.348. sidebar_divider_char
+# 3.361. sidebar_divider_char

 # 
 # Type: string
 # 
 # Type: string

-# Default: (empty)
+# Default: “|”
+# 
+# The default is a Unicode vertical line.

 # 
 # This specifies the characters to be drawn between the sidebar (when visible)
 # and the other NeoMutt panels. ASCII and Unicode line-drawing characters are
 # supported. 
 # 
 # 
 # This specifies the characters to be drawn between the sidebar (when visible)
 # and the other NeoMutt panels. ASCII and Unicode line-drawing characters are
 # supported. 
 # 

+# The divider char can be set to an empty string for some extra space. If empty,
+# setting the sidebar_background color may help distinguish the sidebar from
+# other panels.
+# 

 set sidebar_divider_char=" "
 
 
 set sidebar_divider_char=" "
 
 

-# 3.349. sidebar_folder_indent
+# 3.362. sidebar_folder_indent

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5145,7 +5431,7 @@ set sidebar_divider_char=" "
 set sidebar_folder_indent=yes
 
 
 set sidebar_folder_indent=yes
 
 

-# 3.350. sidebar_format
+# 3.363. sidebar_format

 # 
 # Type: string
 # Default: “%D%*  %n”
 # 
 # Type: string
 # Default: “%D%*  %n”


@@ -5154,6 +5440,8 @@ set sidebar_folder_indent=yes
 # similar to $index_format, but has its own set of printf(3)-like sequences:
 # 
 # ┌───┬──┬──────────────────────────────────────────────────────────────────────┐ 
 # similar to $index_format, but has its own set of printf(3)-like sequences:
 # 
 # ┌───┬──┬──────────────────────────────────────────────────────────────────────┐ 

+# │%a │  │Alert: 1 if user is notified of new mail                              │
+# ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 

 # │%B │  │Name of the mailbox                                                   │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%d │* │Number of deleted messages in the mailbox                             │
 # │%B │  │Name of the mailbox                                                   │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%d │* │Number of deleted messages in the mailbox                             │


@@ -5166,12 +5454,14 @@ set sidebar_folder_indent=yes
 # │%L │* │Number of messages after limiting                                     │
 # │ │@ │                                                                      │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%L │* │Number of messages after limiting                                     │
 # │ │@ │                                                                      │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 

-# │%n │  │"N" if mailbox has new mail, ' ' (space) otherwise                    │
+# │%n │  │"N" if mailbox has new mail, " " (space) otherwise                    │

 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%N │* │Number of unread messages in the mailbox (seen or unseen)             │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%o │* │Number of old messages in the mailbox (unread, seen)                  │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%N │* │Number of unread messages in the mailbox (seen or unseen)             │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%o │* │Number of old messages in the mailbox (unread, seen)                  │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 

+# │%p │  │Poll: 1 if Mailbox is checked for new mail                            │
+# ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 

 # │%r │* │Number of read messages in the mailbox (read, seen)                   │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%S │* │Size of mailbox (total number of messages)                            │
 # │%r │* │Number of read messages in the mailbox (read, seen)                   │
 # ├───┼──┼──────────────────────────────────────────────────────────────────────┤ 
 # │%S │* │Size of mailbox (total number of messages)                            │


@@ -5196,12 +5486,12 @@ set sidebar_folder_indent=yes
 # @ = Only applicable to the current folder
 # 
 # In order to use %S, %N, %F, and %!, $mail_check_stats must be set. When thus
 # @ = Only applicable to the current folder
 # 
 # In order to use %S, %N, %F, and %!, $mail_check_stats must be set. When thus

-# set, a suggested value for this option is "%B%?F? [%F]?%* %?N?%N/?%S".
+# set, a suggested value for this option is "%B%<F? [%F]>%* %<N?%N/>%S".

 # 
 set sidebar_format="%D%?F? [%F]?%*  %?N?%N/?%S"
 
 
 # 
 set sidebar_format="%D%?F? [%F]?%*  %?N?%N/?%S"
 
 

-# 3.351. sidebar_indent_string
+# 3.364. sidebar_indent_string

 # 
 # Type: string
 # Default: “  ”
 # 
 # Type: string
 # Default: “  ”


@@ -5214,7 +5504,7 @@ set sidebar_format="%D%?F? [%F]?%*  %?N?%N/?%S"
 set sidebar_indent_string=" "
 
 
 set sidebar_indent_string=" "
 
 

-# 3.352. sidebar_new_mail_only
+# 3.365. sidebar_new_mail_only

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5222,23 +5512,23 @@ set sidebar_indent_string=" "
 # When set, the sidebar will only display mailboxes containing new, or flagged,
 # mail. 
 # 
 # When set, the sidebar will only display mailboxes containing new, or flagged,
 # mail. 
 # 

-# See also: $sidebar_whitelist, $sidebar_non_empty_mailbox_only.
+# See also: sidebar_pin, $sidebar_non_empty_mailbox_only.

 # 
 
 
 # 
 
 

-# 3.353. sidebar_next_new_wrap
+# 3.366. sidebar_next_new_wrap

 # 
 # Type: boolean
 # Default: no
 # 
 # 
 # Type: boolean
 # Default: no
 # 

-# When set, the <sidebar-next-new> command will not stop and the end of the list
+# When set, the <sidebar-next-new> command will not stop at the end of the list

 # of mailboxes, but wrap around to the beginning. The <sidebar-prev-new> command
 # is similarly affected, wrapping around to the end of the list.
 # 
 set sidebar_next_new_wrap=yes
 
 
 # of mailboxes, but wrap around to the beginning. The <sidebar-prev-new> command
 # is similarly affected, wrapping around to the end of the list.
 # 
 set sidebar_next_new_wrap=yes
 
 

-# 3.354. sidebar_non_empty_mailbox_only
+# 3.367. sidebar_non_empty_mailbox_only

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5246,11 +5536,11 @@ set sidebar_next_new_wrap=yes
 # When set, the sidebar will only display mailboxes that contain one or more
 # mails. 
 # 
 # When set, the sidebar will only display mailboxes that contain one or more
 # mails. 
 # 

-# See also: $sidebar_new_mail_only, $sidebar_whitelist.
+# See also: $sidebar_new_mail_only, sidebar_pin.

 # 
 
 
 # 
 
 

-# 3.355. sidebar_on_right
+# 3.368. sidebar_on_right

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5259,7 +5549,7 @@ set sidebar_next_new_wrap=yes
 # 
 
 
 # 
 
 

-# 3.356. sidebar_short_path
+# 3.369. sidebar_short_path

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5286,13 +5576,13 @@ set sidebar_next_new_wrap=yes
 set sidebar_short_path=no
 
 
 set sidebar_short_path=no
 
 

-# 3.357. sidebar_sort_method
+# 3.370. sidebar_sort_method

 # 
 # Type: sort order
 # Default: order
 # 
 # Specifies how to sort mailbox entries in the sidebar. By default, the entries
 # 
 # Type: sort order
 # Default: order
 # 
 # Specifies how to sort mailbox entries in the sidebar. By default, the entries

-# are sorted alphabetically. Valid values:
+# are unsorted. Valid values:

 # 
 # • path (alphabetically)
 # 
 # 
 # • path (alphabetically)
 # 


@@ -5300,21 +5590,20 @@ set sidebar_short_path=no
 # 
 # • flagged (flagged message count)
 # 
 # 
 # • flagged (flagged message count)
 # 

-# • new (unread message count)
-# 

 # • unread (unread message count)
 # 
 # • unsorted
 # 
 # You may optionally use the "reverse-" prefix to specify reverse sorting order
 # • unread (unread message count)
 # 
 # • unsorted
 # 
 # You may optionally use the "reverse-" prefix to specify reverse sorting order

-# (example: "set sidebar_sort_method=reverse-alpha").
+# (example: "set sidebar_sort_method=reverse-path").

 # 
 # 

-# The "alpha" and "name" values are synonyms for "path".
+# The alpha and name values are synonyms for path. The new value is a synonym for
+# unread. 

 # 
 set sidebar_sort_method=path
 
 
 # 
 set sidebar_sort_method=path
 
 

-# 3.358. sidebar_visible
+# 3.371. sidebar_visible

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5327,7 +5616,7 @@ set sidebar_sort_method=path
 set sidebar_visible=no
 
 
 set sidebar_visible=no
 
 

-# 3.359. sidebar_width
+# 3.372. sidebar_width

 # 
 # Type: number
 # Default: 30
 # 
 # Type: number
 # Default: 30


@@ -5339,7 +5628,7 @@ set sidebar_visible=no
 set sidebar_width=20
 
 
 set sidebar_width=20
 
 

-# 3.360. sig_dashes
+# 3.373. sig_dashes

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5354,7 +5643,7 @@ set sidebar_width=20
 set sig_dashes=no
 
 
 set sig_dashes=no
 
 

-# 3.361. sig_on_top
+# 3.374. sig_on_top

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5366,7 +5655,7 @@ set sig_dashes=no
 # 
 
 
 # 
 
 

-# 3.362. signature
+# 3.375. signature

 # 
 # Type: path
 # Default: “~/.signature”
 # 
 # Type: path
 # Default: “~/.signature”


@@ -5377,7 +5666,7 @@ set sig_dashes=no
 # 
 
 
 # 
 
 

-# 3.363. simple_search
+# 3.376. simple_search

 # 
 # Type: string
 # Default: “~f %s | ~s %s”
 # 
 # Type: string
 # Default: “~f %s | ~s %s”


@@ -5386,6 +5675,9 @@ set sig_dashes=no
 # A simple search is one that does not contain any of the "~" pattern operators.
 # See "patterns" for more information on search patterns.
 # 
 # A simple search is one that does not contain any of the "~" pattern operators.
 # See "patterns" for more information on search patterns.
 # 

+# simple_search applies to several functions, e.g. <delete-pattern>, <limit>,
+# searching in the index, and all of the index colors.
+# 

 # For example, if you simply type "joe" at a search or limit prompt, NeoMutt will
 # automatically expand it to the value specified by this variable by replacing
 # "%s" with the supplied string. For the default value, "joe" would be expanded
 # For example, if you simply type "joe" at a search or limit prompt, NeoMutt will
 # automatically expand it to the value specified by this variable by replacing
 # "%s" with the supplied string. For the default value, "joe" would be expanded


@@ -5394,7 +5686,7 @@ set sig_dashes=no
 set simple_search="~L %s | ~s %s"
 
 
 set simple_search="~L %s | ~s %s"
 
 

-# 3.364. size_show_bytes
+# 3.377. size_show_bytes

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5404,7 +5696,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.365. size_show_fractions
+# 3.378. size_show_fractions

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5414,7 +5706,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.366. size_show_mb
+# 3.379. size_show_mb

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5424,7 +5716,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.367. size_units_on_left
+# 3.380. size_units_on_left

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5434,7 +5726,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.368. sleep_time
+# 3.381. sleep_time

 # 
 # Type: number
 # Default: 1
 # 
 # Type: number
 # Default: 1


@@ -5446,7 +5738,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.369. smart_wrap
+# 3.382. smart_wrap

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5457,7 +5749,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.370. smileys
+# 3.383. smileys

 # 
 # Type: regular expression
 # Default: “(>From )|(:[-^]?[][)(><}{|/DP])”
 # 
 # Type: regular expression
 # Default: “(>From )|(:[-^]?[][)(><}{|/DP])”


@@ -5468,7 +5760,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.371. smime_ask_cert_label
+# 3.384. smime_ask_cert_label

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5479,7 +5771,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.372. smime_ca_location
+# 3.385. smime_ca_location

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -5489,7 +5781,7 @@ set simple_search="~L %s | ~s %s"
 # 
 
 
 # 
 
 

-# 3.373. smime_certificates
+# 3.386. smime_certificates

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -5504,36 +5796,36 @@ set simple_search="~L %s | ~s %s"
 set smime_certificates="~/.smime/certificates"
 
 
 set smime_certificates="~/.smime/certificates"
 
 

-# 3.374. smime_decrypt_command
+# 3.387. smime_decrypt_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # This format string specifies a command which is used to decrypt application/
 # 
 # Type: command
 # Default: (empty)
 # 
 # This format string specifies a command which is used to decrypt application/

-# x-pkcs7-mime attachments.
+# pkcs7-mime attachments.

 # 
 # The OpenSSL command formats have their own set of printf(3)-like sequences
 # similar to PGP's:
 # 
 # ┌──┬──────────────────────────────────────────────────────────────────────────┐ 
 # 
 # The OpenSSL command formats have their own set of printf(3)-like sequences
 # similar to PGP's:
 # 
 # ┌──┬──────────────────────────────────────────────────────────────────────────┐ 

-# │%f│Expands to the name of a file containing a message.                       │
+# │%a│The algorithm used for encryption.                                        │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │%s│Expands to the name of a file containing the signature part of a multipart│
-# │ │/signed attachment when verifying it.                                     │
+# │%c│One or more certificate IDs.                                              │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │%k│The key-pair specified with $smime_default_key                            │
+# │ │CA location: Depending on whether $smime_ca_location points to a directory│
+# │%C│or file, this expands to "-CApath $smime_ca_location" or "-CAfile         │
+# │ │$smime_ca_location".                                                      │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │%i│Intermediate certificates                                                 │
+# │%d│The message digest algorithm specified with $smime_sign_digest_alg.       │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │%c│One or more certificate IDs.                                              │
+# │%f│Expands to the name of a file containing a message.                       │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │%a│The algorithm used for encryption.                                        │
+# │%i│Intermediate certificates                                                 │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │%d│The message digest algorithm specified with $smime_sign_digest_alg.       │
+# │%k│The key-pair specified with $smime_default_key                            │

 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 
 # ├──┼──────────────────────────────────────────────────────────────────────────┤ 

-# │ │CA location: Depending on whether $smime_ca_location points to a directory│
-# │%C│or file, this expands to "-CApath $smime_ca_location" or "-CAfile         │
-# │ │$smime_ca_location".                                                      │
+# │%s│Expands to the name of a file containing the signature part of a multipart│
+# │ │/signed attachment when verifying it.                                     │

 # └──┴──────────────────────────────────────────────────────────────────────────┘ 
 # 
 # For examples on how to configure these formats, see the smime.rc in the samples
 # └──┴──────────────────────────────────────────────────────────────────────────┘ 
 # 
 # For examples on how to configure these formats, see the smime.rc in the samples


@@ -5542,7 +5834,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.375. smime_decrypt_use_default_key
+# 3.388. smime_decrypt_use_default_key

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5554,7 +5846,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.376. smime_default_key
+# 3.389. smime_default_key

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -5563,6 +5855,7 @@ set smime_certificates="~/.smime/certificates"
 # the keyid (the hash-value that OpenSSL generates) to work properly.
 # 
 # It will be used for encryption (see $postpone_encrypt and $smime_self_encrypt).
 # the keyid (the hash-value that OpenSSL generates) to work properly.
 # 
 # It will be used for encryption (see $postpone_encrypt and $smime_self_encrypt).

+# If GPGME is enabled, this is the key id displayed by gpgsm.

 # 
 # It will be used for decryption unless $smime_decrypt_use_default_key is unset.
 # 
 # 
 # It will be used for decryption unless $smime_decrypt_use_default_key is unset.
 # 


@@ -5573,7 +5866,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.377. smime_encrypt_command
+# 3.390. smime_encrypt_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5583,14 +5876,15 @@ set smime_certificates="~/.smime/certificates"
 # This is a format string, see the $smime_decrypt_command command for possible
 # printf(3)-like sequences. (S/MIME only)
 # 
 # This is a format string, see the $smime_decrypt_command command for possible
 # printf(3)-like sequences. (S/MIME only)
 # 

-# Encrypt the message to $smime_default_key too. (S/MIME only) Note: On Debian
-# systems, this defaults to the first existing file in the following list: ~
-# /.smime/ca-certificates.crt ~/.smime/ca-bundle.crt /etc/ssl/certs/
-# ca-certificates.crt. 
+# Encrypt the message to $smime_default_key too. (S/MIME only)
+# 
+# Note: On Debian systems, this defaults to the first existing file in the
+# following list: ~/.smime/ca-certificates.crt ~/.smime/ca-bundle.crt /etc/ssl/
+# certs/ca-certificates.crt. 

 # 
 
 
 # 
 
 

-# 3.378. smime_encrypt_with
+# 3.391. smime_encrypt_with

 # 
 # Type: string
 # Default: “aes256”
 # 
 # Type: string
 # Default: “aes256”


@@ -5601,7 +5895,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.379. smime_get_cert_command
+# 3.392. smime_get_cert_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5613,7 +5907,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.380. smime_get_cert_email_command
+# 3.393. smime_get_cert_email_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5627,7 +5921,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.381. smime_get_signer_cert_command
+# 3.394. smime_get_signer_cert_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5641,7 +5935,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.382. smime_import_cert_command
+# 3.395. smime_import_cert_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5654,7 +5948,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.383. smime_is_default
+# 3.396. smime_is_default

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -5667,7 +5961,7 @@ set smime_certificates="~/.smime/certificates"
 # 
 
 
 # 
 
 

-# 3.384. smime_keys
+# 3.397. smime_keys

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -5682,7 +5976,7 @@ set smime_certificates="~/.smime/certificates"
 set smime_keys="~/.smime/keys"
 
 
 set smime_keys="~/.smime/keys"
 
 

-# 3.385. smime_pk7out_command
+# 3.398. smime_pk7out_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5695,7 +5989,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.386. smime_self_encrypt
+# 3.399. smime_self_encrypt

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -5705,7 +5999,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.387. smime_sign_as
+# 3.400. smime_sign_as

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -5716,7 +6010,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.388. smime_sign_command
+# 3.401. smime_sign_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5729,7 +6023,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.389. smime_sign_digest_alg
+# 3.402. smime_sign_digest_alg

 # 
 # Type: string
 # Default: “sha256”
 # 
 # Type: string
 # Default: “sha256”


@@ -5740,7 +6034,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.390. smime_timeout
+# 3.403. smime_timeout

 # 
 # Type: number
 # Default: 300
 # 
 # Type: number
 # Default: 300


@@ -5750,7 +6044,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.391. smime_verify_command
+# 3.404. smime_verify_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5762,20 +6056,20 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.392. smime_verify_opaque_command
+# 3.405. smime_verify_opaque_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # This command is used to verify S/MIME signatures of type application/
 # 
 # Type: command
 # Default: (empty)
 # 
 # This command is used to verify S/MIME signatures of type application/

-# x-pkcs7-mime. 
+# pkcs7-mime. 

 # 
 # This is a format string, see the $smime_decrypt_command command for possible
 # printf(3)-like sequences. (S/MIME only)
 # 
 
 
 # 
 # This is a format string, see the $smime_decrypt_command command for possible
 # printf(3)-like sequences. (S/MIME only)
 # 
 
 

-# 3.393. smtp_authenticators
+# 3.406. smtp_authenticators

 # 
 # Type: string list
 # Default: (empty)
 # 
 # Type: string list
 # Default: (empty)


@@ -5795,7 +6089,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.394. smtp_oauth_refresh_command
+# 3.407. smtp_oauth_refresh_command

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -5807,7 +6101,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.395. smtp_pass
+# 3.408. smtp_pass

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -5822,7 +6116,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.396. smtp_url
+# 3.409. smtp_url

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -5839,7 +6133,7 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.397. smtp_user
+# 3.410. smtp_user

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -5850,7 +6144,18 @@ set smime_keys="~/.smime/keys"
 # 
 
 
 # 
 
 

-# 3.398. sort
+# 3.411. socket_timeout
+# 
+# Type: number
+# Default: 30
+# 
+# Causes NeoMutt to timeout any socket connect/read/write operation (for IMAP,
+# POP or SMTP) after this many seconds. A negative value causes NeoMutt to wait
+# indefinitely. 
+# 
+
+
+# 3.412. sort

 # 
 # Type: sort order
 # Default: date
 # 
 # Type: sort order
 # Default: date


@@ -5891,22 +6196,22 @@ set smime_keys="~/.smime/keys"
 # synonym for "unsorted".
 # 
 # The values of "threads" and "reverse-threads" are legacy options, which cause
 # synonym for "unsorted".
 # 
 # The values of "threads" and "reverse-threads" are legacy options, which cause

-# the value of $sort_aux to also contol sorting between threads, and they may not
-# be used with the "last-" prefix. The preferred way to enable a threaded view is
-# via $use_threads. This variable can also be set via the <sort-mailbox> and
-# <sort-reverse> functions.
+# the value of $sort_aux to also control sorting between threads, and they may
+# not be used with the "last-" prefix. The preferred way to enable a threaded
+# view is via $use_threads. This variable can also be set via the <sort-mailbox>
+# and <sort-reverse> functions.

 # 
 # Note: When $use_threads is "threads", the last thread sorts to the bottom; when
 # it is "reversed", the last thread sorts to the top. The use of "reverse-" in
 # $sort swaps which end the last thread will sort to.
 # 
 # See the "Use Threads Feature" section for further explanation and examples,
 # 
 # Note: When $use_threads is "threads", the last thread sorts to the bottom; when
 # it is "reversed", the last thread sorts to the top. The use of "reverse-" in
 # $sort swaps which end the last thread will sort to.
 # 
 # See the "Use Threads Feature" section for further explanation and examples,

-# https://neomutt.org/feature/use-threads. 
+# https://neomutt.org/feature/use-threads 

 # 
 set sort=threads
 
 
 # 
 set sort=threads
 
 

-# 3.399. sort_alias
+# 3.413. sort_alias

 # 
 # Type: sort order
 # Default: alias
 # 
 # Type: sort order
 # Default: alias


@@ -5925,7 +6230,7 @@ set sort=threads
 # 
 
 
 # 
 
 

-# 3.400. sort_aux
+# 3.414. sort_aux

 # 
 # Type: sort order
 # Default: date
 # 
 # Type: sort order
 # Default: date


@@ -5947,12 +6252,12 @@ set sort=threads
 # and not with $sort_aux.
 # 
 # See the "Use Threads Feature" section for further explanation and examples,
 # and not with $sort_aux.
 # 
 # See the "Use Threads Feature" section for further explanation and examples,

-# https://neomutt.org/feature/use-threads. 
+# https://neomutt.org/feature/use-threads 

 # 
 set sort_aux=last-date-received
 
 
 # 
 set sort_aux=last-date-received
 
 

-# 3.401. sort_browser
+# 3.415. sort_browser

 # 
 # Type: sort order
 # Default: alpha
 # 
 # Type: sort order
 # Default: alpha


@@ -5981,22 +6286,22 @@ set sort_aux=last-date-received
 # 
 
 
 # 
 
 

-# 3.402. sort_re
+# 3.416. sort_re

 # 
 # Type: boolean
 # Default: yes
 # 
 # This variable is only useful when sorting by threads with $strict_threads unset
 # 
 # Type: boolean
 # Default: yes
 # 
 # This variable is only useful when sorting by threads with $strict_threads unset

-# . In that case, it changes the heuristic mutt uses to thread messages by
-# subject. With $sort_re set, mutt will only attach a message as the child of
+# . In that case, it changes the heuristic neomutt uses to thread messages by
+# subject. With $sort_re set, neomutt will only attach a message as the child of

 # another message by subject if the subject of the child message starts with a
 # another message by subject if the subject of the child message starts with a

-# substring matching the setting of $reply_regex. With $sort_re unset, mutt will
-# attach the message whether or not this is the case, as long as the non-
+# substring matching the setting of $reply_regex. With $sort_re unset, neomutt
+# will attach the message whether or not this is the case, as long as the non-

 # $reply_regex parts of both messages are identical.
 # 
 
 
 # $reply_regex parts of both messages are identical.
 # 
 
 

-# 3.403. spam_separator
+# 3.417. spam_separator

 # 
 # Type: string
 # Default: “,”
 # 
 # Type: string
 # Default: “,”


@@ -6008,7 +6313,7 @@ set sort_aux=last-date-received
 # 
 
 
 # 
 
 

-# 3.404. spool_file
+# 3.418. spool_file

 # 
 # Type: mailbox
 # Default: (empty)
 # 
 # Type: mailbox
 # Default: (empty)


@@ -6023,7 +6328,7 @@ set sort_aux=last-date-received
 set spool_file="=inbox"
 
 
 set spool_file="=inbox"
 
 

-# 3.405. ssl_ca_certificates_file
+# 3.419. ssl_ca_certificates_file

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -6036,13 +6341,10 @@ set spool_file="=inbox"
 # 
 # set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 # 
 # 
 # set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 # 

-# Note: On Debian systems, this option is set by default to “threads” in /etc/
-# Muttrc. 
-# 

 set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 
 
 set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 
 

-# 3.406. ssl_ciphers
+# 3.420. ssl_ciphers

 # 
 # Type: string
 # Default: (empty)
 # 
 # Type: string
 # Default: (empty)


@@ -6056,7 +6358,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.407. ssl_client_cert
+# 3.421. ssl_client_cert

 # 
 # Type: path
 # Default: (empty)
 # 
 # Type: path
 # Default: (empty)


@@ -6065,7 +6367,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.408. ssl_force_tls
+# 3.422. ssl_force_tls

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6077,7 +6379,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.409. ssl_min_dh_prime_bits
+# 3.423. ssl_min_dh_prime_bits

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -6088,7 +6390,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.410. ssl_starttls
+# 3.424. ssl_starttls

 # 
 # Type: quadoption
 # Default: yes
 # 
 # Type: quadoption
 # Default: yes


@@ -6103,40 +6405,62 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.411. ssl_use_sslv3
+# 3.425. ssl_use_sslv2
+# 
+# Type: boolean
+# Default: no
+# 
+# If set , NeoMutt will use SSLv2 when communicating with servers that request
+# it. N.B. As of 2011, SSLv2 is considered insecure, and using is inadvisable.
+# See https://tools.ietf.org/html/rfc6176 (OpenSSL only)
+# 
+
+
+# 3.426. ssl_use_sslv3

 # 
 # Type: boolean
 # Default: no
 # 
 # If set , NeoMutt will use SSLv3 when communicating with servers that request
 # it. N.B. As of 2015, SSLv3 is considered insecure, and using it is inadvisable.
 # 
 # Type: boolean
 # Default: no
 # 
 # If set , NeoMutt will use SSLv3 when communicating with servers that request
 # it. N.B. As of 2015, SSLv3 is considered insecure, and using it is inadvisable.

-# See https://tools.ietf.org/html/rfc7525 .
+# See https://tools.ietf.org/html/rfc7525

 # 
 
 
 # 
 
 

-# 3.412. ssl_use_tlsv1
+# 3.427. ssl_use_system_certs
+# 
+# Type: boolean
+# Default: yes
+# 
+# If set to yes, NeoMutt will use CA certificates in the system-wide certificate
+# store when checking if a server certificate is signed by a trusted CA. (OpenSSL
+# only) 
+# 
+
+
+# 3.428. ssl_use_tlsv1

 # 
 # Type: boolean
 # Default: no
 # 
 # If set , NeoMutt will use TLSv1.0 when communicating with servers that request
 # it. N.B. As of 2015, TLSv1.0 is considered insecure, and using it is
 # 
 # Type: boolean
 # Default: no
 # 
 # If set , NeoMutt will use TLSv1.0 when communicating with servers that request
 # it. N.B. As of 2015, TLSv1.0 is considered insecure, and using it is

-# inadvisable. See https://tools.ietf.org/html/rfc7525 .
+# inadvisable. See https://tools.ietf.org/html/rfc7525

 # 
 
 
 # 
 
 

-# 3.413. ssl_use_tlsv1_1
+# 3.429. ssl_use_tlsv1_1

 # 
 # Type: boolean
 # Default: no
 # 
 # If set , NeoMutt will use TLSv1.1 when communicating with servers that request
 # it. N.B. As of 2015, TLSv1.1 is considered insecure, and using it is
 # 
 # Type: boolean
 # Default: no
 # 
 # If set , NeoMutt will use TLSv1.1 when communicating with servers that request
 # it. N.B. As of 2015, TLSv1.1 is considered insecure, and using it is

-# inadvisable. See https://tools.ietf.org/html/rfc7525 .
+# inadvisable. See https://tools.ietf.org/html/rfc7525

 # 
 
 
 # 
 
 

-# 3.414. ssl_use_tlsv1_2
+# 3.430. ssl_use_tlsv1_2

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6146,7 +6470,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.415. ssl_use_tlsv1_3
+# 3.431. ssl_use_tlsv1_3

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6156,7 +6480,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.416. ssl_verify_dates
+# 3.432. ssl_verify_dates

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6167,7 +6491,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.417. ssl_verify_host
+# 3.433. ssl_verify_host

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6179,7 +6503,24 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.418. status_chars
+# 3.434. ssl_verify_partial_chains
+# 
+# Type: boolean
+# Default: no
+# 
+# This option should not be changed from the default unless you understand what
+# you are doing.
+# 
+# Setting this variable to yes will permit verifying partial certification
+# chains, i. e. a certificate chain where not the root, but an intermediate
+# certificate CA, or the host certificate, are marked trusted (in
+# $certificate_file), without marking the root signing CA as trusted.
+# 
+# (OpenSSL 1.0.2b and newer only).
+# 
+
+
+# 3.435. status_chars

 # 
 # Type: character string
 # Default: “-*%A”
 # 
 # Type: character string
 # Default: “-*%A”


@@ -6204,12 +6545,12 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # 
 
 
 # 
 
 

-# 3.419. status_format
+# 3.436. status_format

 # 
 # Type: string
 # 
 # Type: string

-# Default: “-%r-NeoMutt: %D [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?
-# %?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%?T?%T/?%s/%S)
-# -%>-(%P)---” 
+# Default: “-%r-NeoMutt: %D [Msgs:%<M?%M/>%m%<n? New:%n>%<o? Old:%o>%<d? Del:%d>%
+# <F? Flag:%F>%<t? Tag:%t>%<p? Post:%p>%<b? Inc:%b>%<l? %l>]---(%<T?%T/>%s/%S)-%>
+# -(%P)---” 

 # 
 # Controls the format of the status line displayed in the "index" menu. This
 # string is similar to $index_format, but has its own set of printf(3)-like
 # 
 # Controls the format of the status line displayed in the "index" menu. This
 # string is similar to $index_format, but has its own set of printf(3)-like


@@ -6281,21 +6622,20 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # optionally print a string based upon one of the above sequences, the following
 # construct is used:
 # 
 # optionally print a string based upon one of the above sequences, the following
 # construct is used:
 # 

-# %?<sequence_char>?<optional_string>? 
+# %<sequence_char?optional_string> 

 # 
 # where sequence_char is a character from the table above, and optional_string is
 # the string you would like printed if sequence_char is nonzero. optional_string
 # 
 # where sequence_char is a character from the table above, and optional_string is
 # the string you would like printed if sequence_char is nonzero. optional_string

-# may contain other sequences as well as normal text, but you may not nest
-# optional strings.
+# may contain other sequences as well as normal text.

 # 
 # Here is an example illustrating how to optionally print the number of new
 # messages in a mailbox:
 # 
 # 
 # Here is an example illustrating how to optionally print the number of new
 # messages in a mailbox:
 # 

-# %?n?%n new messages.?
+# %<n?%n new messages>

 # 
 # You can also switch between two strings using the following construct:
 # 
 # 
 # You can also switch between two strings using the following construct:
 # 

-# %?<sequence_char>?<if_string>&<else_string>? 
+# %<sequence_char?if_string&else_string> 

 # 
 # If the value of sequence_char is non-zero, if_string will be expanded,
 # otherwise else_string will be expanded.
 # 
 # If the value of sequence_char is non-zero, if_string will be expanded,
 # otherwise else_string will be expanded.


@@ -6303,7 +6643,7 @@ set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 # As another example, here is how to show either $sort and $sort_aux or
 # $use_threads and $sort, based on whether threads are enabled with $use_threads:
 # 
 # As another example, here is how to show either $sort and $sort_aux or
 # $use_threads and $sort, based on whether threads are enabled with $use_threads:
 # 

-# %?T?%s/%S&%T/%s? 
+# %<T?%s/%S&%T/%s> 

 # 
 # You can force the result of any printf(3)-like sequence to be lowercase by
 # prefixing the sequence character with an underscore ("_") sign. For example, if
 # 
 # You can force the result of any printf(3)-like sequence to be lowercase by
 # prefixing the sequence character with an underscore ("_") sign. For example, if


@@ -6316,7 +6656,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) "
 
 
 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.420. status_on_top
+# 3.437. status_on_top

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6327,7 +6667,7 @@ set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%
 # 
 
 
 # 
 
 

-# 3.421. strict_threads
+# 3.438. strict_threads

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6342,7 +6682,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
 
 
 set strict_threads=yes
 
 

-# 3.422. suspend
+# 3.439. suspend

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6351,9 +6691,13 @@ set strict_threads=yes
 # usually "^Z". This is useful if you run NeoMutt inside an xterm using a command
 # like "xterm -e neomutt".
 # 
 # usually "^Z". This is useful if you run NeoMutt inside an xterm using a command
 # like "xterm -e neomutt".
 # 

+# On startup NeoMutt tries to detect if it is the process session leader. If so,
+# the default of suspend is "no" otherwise "yes". This default covers the above
+# mentioned use case of "xterm -e neomutt".
+# 

 
 
 
 

-# 3.423. text_flowed
+# 3.440. text_flowed

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6372,7 +6716,7 @@ set strict_threads=yes
 set text_flowed=yes
 
 
 set text_flowed=yes
 
 

-# 3.424. thorough_search
+# 3.441. thorough_search

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6390,18 +6734,27 @@ set text_flowed=yes
 set thorough_search=yes
 
 
 set thorough_search=yes
 
 

-# 3.425. thread_received
+# 3.442. thread_received

 # 
 # Type: boolean
 # Default: no
 # 
 # 
 # Type: boolean
 # Default: no
 # 

-# When set, NeoMutt uses the date received rather than the date sent to thread
-# messages by subject.
+# If $strict_threads is unset, then messages may also be grouped by subject.
+# Unlike threading by "In-Reply-To:" and "References:" header, grouping by
+# subject does not imply a parent-child relation between two messages.
+# 
+# To determine the ancestry between messages grouped by subject, Neomutt uses
+# their date: only newer messages can be descendants of older ones.
+# 
+# When $thread_received is set, NeoMutt uses the date received rather than the
+# date sent when comparing messages for the date.
+# 
+# See also $strict_threads, and $sort_re.

 # 
 set thread_received=yes
 
 
 # 
 set thread_received=yes
 
 

-# 3.426. tilde
+# 3.443. tilde

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6412,7 +6765,7 @@ set thread_received=yes
 set tilde=yes
 
 
 set tilde=yes
 
 

-# 3.427. time_inc
+# 3.444. time_inc

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -6427,7 +6780,7 @@ set tilde=yes
 set time_inc=250
 
 
 set time_inc=250
 
 

-# 3.428. timeout
+# 3.445. timeout

 # 
 # Type: number
 # Default: 600
 # 
 # Type: number
 # Default: 600


@@ -6445,7 +6798,7 @@ set time_inc=250
 # 
 
 
 # 
 
 

-# 3.429. tmpdir
+# 3.446. tmp_dir

 # 
 # Type: path
 # Default: “/tmp”
 # 
 # Type: path
 # Default: “/tmp”


@@ -6456,10 +6809,9 @@ set time_inc=250
 # If this variable is not set, the environment variable $TMPDIR is used. Failing
 # that, then "/tmp" is used.
 # 
 # If this variable is not set, the environment variable $TMPDIR is used. Failing
 # that, then "/tmp" is used.
 # 

-set tmpdir=`mktemp -dt $(date +%F-%H%M%S)-neomutt.XXXXXXXXXX`

 
 
 
 

-# 3.430. to_chars
+# 3.447. to_chars

 # 
 # Type: character string
 # Default: “ +TCFLR”
 # 
 # Type: character string
 # Default: “ +TCFLR”


@@ -6490,7 +6842,7 @@ set tmpdir=`mktemp -dt $(date +%F-%H%M%S)-neomutt.XXXXXXXXXX`
 # 
 
 
 # 
 
 

-# 3.431. toggle_quoted_show_levels
+# 3.448. toggle_quoted_show_levels

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -6501,7 +6853,7 @@ set tmpdir=`mktemp -dt $(date +%F-%H%M%S)-neomutt.XXXXXXXXXX`
 # 
 
 
 # 
 
 

-# 3.432. trash
+# 3.449. trash

 # 
 # Type: mailbox
 # Default: (empty)
 # 
 # Type: mailbox
 # Default: (empty)


@@ -6514,7 +6866,7 @@ set tmpdir=`mktemp -dt $(date +%F-%H%M%S)-neomutt.XXXXXXXXXX`
 # 
 
 
 # 
 
 

-# 3.433. ts_enabled
+# 3.450. ts_enabled

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6525,20 +6877,20 @@ set tmpdir=`mktemp -dt $(date +%F-%H%M%S)-neomutt.XXXXXXXXXX`
 set ts_enabled=yes
 
 
 set ts_enabled=yes
 
 

-# 3.434. ts_icon_format
+# 3.451. ts_icon_format

 # 
 # Type: string
 # 
 # Type: string

-# Default: “M%?n?AIL&ail?”
+# Default: “M%<n?AIL&ail>”

 # 
 # Controls the format of the icon title, as long as "$ts_enabled" is set. This
 # string is identical in formatting to the one used by "$status_format".
 # 
 
 
 # 
 # Controls the format of the icon title, as long as "$ts_enabled" is set. This
 # string is identical in formatting to the one used by "$status_format".
 # 
 
 

-# 3.435. ts_status_format
+# 3.452. ts_status_format

 # 
 # Type: string
 # 
 # Type: string

-# Default: “NeoMutt with %?m?%m messages&no messages?%?n? [%n NEW]?”
+# Default: “NeoMutt with %<m?%m messages&no messages>%<n? [%n NEW]>”

 # 
 # Controls the format of the terminal status line (or window title), provided
 # that "$ts_enabled" has been set. This string is identical in formatting to the
 # 
 # Controls the format of the terminal status line (or window title), provided
 # that "$ts_enabled" has been set. This string is identical in formatting to the


@@ -6547,7 +6899,7 @@ set ts_enabled=yes
 set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 
 
 set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 
 

-# 3.436. tunnel
+# 3.453. tunnel

 # 
 # Type: command
 # Default: (empty)
 # 
 # Type: command
 # Default: (empty)


@@ -6567,7 +6919,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
 # 
 
 

-# 3.437. tunnel_is_secure
+# 3.454. tunnel_is_secure

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6584,7 +6936,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
 # 
 
 

-# 3.438. uncollapse_jump
+# 3.455. uncollapse_jump

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6594,18 +6946,19 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
 # 
 
 

-# 3.439. uncollapse_new
+# 3.456. uncollapse_new

 # 
 # Type: boolean
 # Default: yes
 # 
 # When set, NeoMutt will automatically uncollapse any collapsed thread that
 # 
 # Type: boolean
 # Default: yes
 # 
 # When set, NeoMutt will automatically uncollapse any collapsed thread that

-# receives a new message. When unset, collapsed threads will remain collapsed.
-# the presence of the new message will still affect index sorting, though.
+# receives a newly delivered message. When unset, collapsed threads will remain
+# collapsed. The presence of the newly delivered message will still affect index
+# sorting, though.

 # 
 
 
 # 
 
 

-# 3.440. use_8bit_mime
+# 3.457. use_8bit_mime

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6619,7 +6972,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
 # 
 
 

-# 3.441. use_domain
+# 3.458. use_domain

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6629,7 +6982,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 # 
 
 
 # 
 
 

-# 3.442. use_envelope_from
+# 3.459. use_envelope_from

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6646,7 +6999,7 @@ set ts_status_format="[`tty|sed -re 's,.+pts/,,'`]mutt@%h%r %f%?V?[%V]&?"
 set use_envelope_from=yes
 
 
 set use_envelope_from=yes
 
 

-# 3.443. use_from
+# 3.460. use_from

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6657,7 +7010,7 @@ set use_envelope_from=yes
 # 
 
 
 # 
 
 

-# 3.444. use_ipv6
+# 3.461. use_ipv6

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6668,7 +7021,7 @@ set use_envelope_from=yes
 # 
 
 
 # 
 
 

-# 3.445. use_threads
+# 3.462. use_threads

 # 
 # Type: enumeration
 # Default: unset
 # 
 # Type: enumeration
 # Default: unset


@@ -6691,9 +7044,12 @@ set use_envelope_from=yes
 # 
 # See the "Use Threads Feature" section for further explanation and examples.
 # 
 # 
 # See the "Use Threads Feature" section for further explanation and examples.
 # 

+# Note: On Debian systems, this option is set by default to “threads” in /etc/
+# neomuttrc. 
+# 

 
 
 
 

-# 3.446. user_agent
+# 3.463. user_agent

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6703,31 +7059,20 @@ set use_envelope_from=yes
 # 
 
 
 # 
 
 

-# 3.447. vfolder_format
-# 
-# Type: string
-# Default: “%2C %?n?%4n/&     ?%4m %f”
-# 
-# This variable allows you to customize the file browser display for virtual
-# folders to your personal taste. This string uses many of the same expandos as
-# $folder_format. 
-# 
-
-
-# 3.448. virtual_spool_file
+# 3.464. virtual_spool_file

 # 
 # Type: boolean
 # Default: no
 # 
 # 
 # Type: boolean
 # Default: no
 # 

-# When set, NeoMutt will use the first defined virtual mailbox (see
-# virtual-mailboxes) as a spool file.
-# 

 # This command is now unnecessary. $spool_file has been extended to support
 # mailbox descriptions as a value.
 # 
 # This command is now unnecessary. $spool_file has been extended to support
 # mailbox descriptions as a value.
 # 

+# When set, NeoMutt will use the first defined virtual mailbox (see
+# virtual-mailboxes) as a spool file.
+# 

 
 
 
 

-# 3.449. wait_key
+# 3.465. wait_key

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6746,7 +7091,7 @@ set use_envelope_from=yes
 set wait_key=no
 
 
 set wait_key=no
 
 

-# 3.450. weed
+# 3.466. weed

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6758,7 +7103,7 @@ set wait_key=no
 # 
 
 
 # 
 
 

-# 3.451. wrap
+# 3.467. wrap

 # 
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0


@@ -6773,7 +7118,7 @@ set wait_key=no
 set wrap=$reflow_wrap
 
 
 set wrap=$reflow_wrap
 
 

-# 3.452. wrap_headers
+# 3.468. wrap_headers

 # 
 # Type: number
 # Default: 78
 # 
 # Type: number
 # Default: 78


@@ -6787,7 +7132,7 @@ set wrap=$reflow_wrap
 # 
 
 
 # 
 
 

-# 3.453. wrap_search
+# 3.469. wrap_search

 # 
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes


@@ -6799,7 +7144,7 @@ set wrap=$reflow_wrap
 # 
 
 
 # 
 
 

-# 3.454. write_bcc
+# 3.470. write_bcc

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no


@@ -6816,11 +7161,11 @@ set wrap=$reflow_wrap
 # message will always contain the "Bcc:" header if one exists.
 # 
 # Note: On Debian systems, exim4 and postfix strip BCC headers by default. The
 # message will always contain the "Bcc:" header if one exists.
 # 
 # Note: On Debian systems, exim4 and postfix strip BCC headers by default. The

-# above warning applies to exim3 users, see /etc/Muttrc.
+# above warning applies to exim3 users, see /etc/neomuttrc.

 # 
 
 
 # 
 
 

-# 3.455. write_inc
+# 3.471. write_inc

 # 
 # Type: number
 # Default: 10
 # 
 # Type: number
 # Default: 10


@@ -6834,7 +7179,7 @@ set wrap=$reflow_wrap
 # 
 
 
 # 
 
 

-# 3.456. x_comment_to
+# 3.472. x_comment_to

 # 
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no