From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Sat, 27 Aug 2005 06:05:24 +0000 (+0000)
Subject: Rocco Rutte:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=e4ebc9b0ae5de07d53d8b0ecf594244e1bc44d0a

Rocco Rutte:
- kill -D option and -t/-T instead
- add arbitrary self-defined header feature via $user_; see manual


git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@448 e385b8ad-14ed-0310-8656-cc95a2468c6d
---

diff --git a/UPGRADING b/UPGRADING
index 84a6002..1677d71 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -10,6 +10,16 @@ This document is not the place for verbose documentation; it only offers
 the necessary keywords to look them up in the manual, ChangeLog or other
 sources of information.
 
+2005-08-27:
+
+  It's now possible to define and use arbitrary self-defined
+  variables as long as prefixed with user_.
+
+  The $user_agent variable had to be renamed to $agent_string.
+
+  To keep consistency, the -D option has been removed again in
+  favor of -T and -t.
+
 2005-08-25:
 
   Instead of only supporting to expand environment variables via
diff --git a/VERSION.svn b/VERSION.svn
index e9b7520..5379c47 100644
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-447
+448
diff --git a/contrib/muttngrc.vim b/contrib/muttngrc.vim
index 0640154..0c111c9 100644
--- a/contrib/muttngrc.vim
+++ b/contrib/muttngrc.vim
@@ -76,7 +76,7 @@ syn keyword muttrcVarBool	contained reverse_realname rfc2047_parameters save_add
 syn keyword muttrcVarBool	contained sig_dashes sig_on_top smart_wrap sort_re ssl_use_sslv2 ssl_use_sslv3 ssl_use_tlsv1
 syn keyword muttrcVarBool	contained ssl_usesystemcerts status_on_top strict_threads suspend text_flowed thorough_search
 syn keyword muttrcVarBool	contained thread_received tilde uncollapse_jump use_8bitmime use_domain use_from use_ipv6
-syn keyword muttrcVarBool	contained user_agent wait_key weed wrap_search write_bcc
+syn keyword muttrcVarBool	contained agent_string wait_key weed wrap_search write_bcc
 
 syn keyword muttrcVarBool	contained noallow_8bit noallow_ansi noarrow_cursor noascii_chars noaskbcc noaskcc
 syn keyword muttrcVarBool	contained noattach_split noauto_tag noautoedit nobeep nobeep_new nobounce_delivered
@@ -174,7 +174,7 @@ syn keyword muttrcVarStr	contained reply_regexp send_charset sendmail shell sign
 syn keyword muttrcVarStr	contained sort_aux sort_browser spoolfile status_chars status_format tmpdir to_chars tunnel visual
 
 " start mutt-ng specific keywords
-syn keyword muttrcVarStr	contained assumed_charset file_charset nntp_group_index_format header_cache indent_stringing nntp_inews
+syn keyword muttrcVarStr	contained assumed_charset file_charset nntp_group_index_format header_cache indent_string nntp_inews
 syn keyword muttrcVarStr	contained msgid_format nntp_pass nntp_cache_dir nntp_host nntp_newsrc nntp_user operating_system
 syn keyword muttrcVarStr	contained sidebar_delim signoff_string smtp_pass smtp_user smtp_host xterm_icon
 syn keyword muttrcVarStr	contained xterm_title
diff --git a/contrib/sample.muttngrc b/contrib/sample.muttngrc
index ac4c422..edddfd5 100644
--- a/contrib/sample.muttngrc
+++ b/contrib/sample.muttngrc
@@ -426,7 +426,7 @@ set tilde
 set trash=+papierkorb
 
 # Set the User-Agent-Header.
-set user_agent
+set agent_string
 
 # Do not wait for a keypress, if I use a commando like "pipe-message".
 unset wait_key
diff --git a/contrib/sample.muttrc b/contrib/sample.muttrc
index d561050..bfc7eb8 100644
--- a/contrib/sample.muttrc
+++ b/contrib/sample.muttrc
@@ -48,7 +48,7 @@ set help			# show the help lines
 #set history=20			# number of lines of history to remember
 #set hostname="mutt.org"	# my DNS domain
 set include			# always include messages when replying
-#set indent_stringing="> "		# how to quote replied text
+#set indent_string="> "		# how to quote replied text
 #set locale="C"			# locale to use for printing time
 #set mailcap_path="~/.mailcap:/usr/local/share/mailcap"
 set nomark_old			# i don't care about whether a message is old
@@ -65,7 +65,7 @@ set pager_index_lines=6		# how many index lines to show in the pager
 #set pager_stop			# don't move to the next message on next-page
 #set pgp_strict_enc		# use Q-P encoding when needed for PGP
 set postponed=+postponed	# mailbox to store postponed messages in
-#set post_indent_stringing='---end quoted text---'
+#set post_indent_string='---end quoted text---'
 #set print=ask-yes		# ask me if I really want to print messages
 set print_command=/bin/false	# how to print things (I like to save trees)
 set noprompt_after	# ask me for a command after the external pager exits
diff --git a/contrib/update-config.pl b/contrib/update-config.pl
index 9a57029..1cea17a 100755
--- a/contrib/update-config.pl
+++ b/contrib/update-config.pl
@@ -50,7 +50,8 @@ my %opts = (
   " x_comment_to"                 => " nntp_x_comment_to",
   # libesmtp
   " smtp_auth_username"           => " smtp_user",
-  " smtp_auth_password"           => " smtp_pass"
+  " smtp_auth_password"           => " smtp_pass",
+  " user_agent"                   => " agent_string"
 );
 
 if (@ARGV == 0) {
diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 39bc7a1..5dcbb64 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -1162,7 +1162,7 @@ usually place your <ref id="commands" name="commands"> to configure Mutt-ng.
 
 <!--}}}--> 
 
-<sect>Syntax of Initialization Files<label id="muttrc-syntax"> <!--{{{--> 
+<sect>Basic Syntax of Initialization Files<label id="muttrc-syntax"> <!--{{{--> 
 <p>
 
 An initialization file consists of a series of <ref id="commands"
@@ -1235,33 +1235,119 @@ line1 ``continues'' until line4. however, the part after the &num; is a
 comment which includes line3 and line4. line5 is a new line of its own and
 thus is interpreted again.
 
-It is also possible to substitute the output of a Unix command in an
-initialization file.  This is accomplished by enclosing the command in
-backquotes (``).  For example,
+The commands understood by mutt are explained in the next paragraphs.
+For a complete list, see the <ref id="commands" name="command reference">.
+
+<!--}}}--> 
+
+<sect>Variable Expansion <!--{{{--> 
+
+  <sect1>Commands' Output 
+
+    <p>It is possible to substitute the output of a Unix command in an
+    initialization file.  This is accomplished by enclosing the command
+    in backquotes (``) as in, for example:
+
 <tscreen><verb>
 my_hdr X-Operating-System: `uname -a`
 </verb></tscreen>
-The output of the Unix command ``uname -a'' will be substituted before the
-line is parsed.  Note that since initialization files are line oriented, only
-the first line of output from the Unix command will be substituted.
 
-UNIX environments can be accessed like the way it is done in shells like
-sh and bash: Prepend the name of the environment by a ``&dollar;''.  For
-example,
+    <p>The output of the Unix command ``uname -a'' will be substituted
+    before the line is parsed. Note that since initialization files are
+    line oriented, only the first line of output from the Unix command
+    will be substituted.
+
+  <sect1>Environment Variables 
+
+    <p>UNIX environments can be accessed like the way it is done in
+    shells like sh and bash: Prepend the name of the environment by a
+    ``&dollar;'' sign. For example,
+
 <tscreen><verb>
 set record=+sent_on_$HOSTNAME
 </verb></tscreen>
 
-This also applies for all configuration variables known to mutt-ng,
-for example
+    <p>sets the <ref id="record" name="&dollar;record"> variable to the
+    string <em/+sent_on_/ and appends the value of the evironment
+    variable <tt>&dollar;HOSTNAME</tt>.
+
+    <p><bf/Note:/ There will be no warning if an environment variable
+    is not defined. The result will of the expansion will then be empty.
+
+  <sect1>Configuration Variables 
+
+    <p>As for environment variables, the values of all configuration
+    variables as string can be used in the same way, too. For example,
+
 <tscreen><verb>
 set imap_home_namespace = $folder
 </verb></tscreen>
 
-The commands understood by mutt are explained in the next paragraphs.
-For a complete list, see the <ref id="commands" name="command reference">.
+    <p>would set the value of <ref id="imap_home_namespace"
+    name="&dollar;imap&lowbar;home&lowbar;namespace"> to the value to
+    which <ref id="folder" name="&dollar;folder"> is <em/currently/ set
+    to.
 
-<!--}}}--> 
+    <p><bf/Note:/ There're no logical links established in such cases so
+    that the the value for <ref id="imap_home_namespace"
+    name="&dollar;imap&lowbar;home&lowbar;namespace"> won't change even
+    if <ref id="folder" name="&dollar;folder"> gets changed.
+
+    <p><bf/Note:/ There will be no warning if a configuration variable
+    is not defined or is empty. The result will of the expansion will
+    then be empty.
+
+  <sect1>Self-Defined Variables 
+
+    <p>Mutt-ng flexibly allows users to define their own variables. To
+    avoid conflicts with the standard set and to prevent misleading
+    error messages, there's a reserved namespace for them. All
+    user-defined variables must be prefixed with <tt/user_/ and can be
+    used just like any ordinary configuration or environment
+    variable.
+
+    <p>For example, to view the manual, users can either define three
+    macros like the following
+
+<tscreen><verb>
+macro generic &lt;F1&gt; "!less -r /path/to/manual" "Show manual"
+macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"
+macro index &lt;F1&gt; "!less -r /path/to/manual" "Show manual"
+</verb></tscreen>
+
+    <p>for <tt/generic/, <tt/pager/ and <tt/index/. The alternative is to
+    define a custom variable like so:
+
+<tscreen><verb>
+set user_manualcmd = '!less -r /path/to_manual"
+macro generic &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
+macro pager &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
+macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
+</verb></tscreen>
+
+    <p>Using this feature, arbitrary sequences can be defined once and
+    recalled and reused where necessary. More advanced scenarios could
+    include to save a variable's value at the beginning of macro
+    sequence and restore it at end.
+
+  <sect1>Type Conversions 
+
+    <p>A note about variable's types during conversion: internally
+    values are stored in internal types but for any dump/query or set
+    operation they're converted to and from string. That means that
+    there's no need to worry about types when referencing any variable.
+    As an example, the following can be used without harm (besides
+    makeing muttng very likely behave strange):
+
+<tscreen><verb>
+set read_inc = 100
+set folder = $read_inc
+set $read_inc = $folder
+set user_magic_number = 42
+set folder = $user_magic_number
+</verb></tscreen>
+
+<!--}}}-->
 
 <sect>Defining/Using aliases<label id="alias"> <!--{{{--> 
 <p>
@@ -4525,7 +4611,6 @@ to send messages from the command line as well.
 -a      attach a file to a message
 -b      specify a blind carbon-copy (BCC) address
 -c      specify a carbon-copy (Cc) address
--D      print the value of all variables on stdout
 -e      specify a config command to be run after initialization files are read
 -f      specify a mailbox to load
 -F      specify an alternate file to read initialization commands
@@ -4538,6 +4623,8 @@ to send messages from the command line as well.
 -Q      query a configuration variable
 -R      open mailbox in read-only mode
 -s      specify a subject (enclose in quotes if it contains spaces)
+-t      dump the value of all variables to stdout
+-T      dump the value of all changed variables to stdout
 -v      show version number and compile-time definitions
 -x      simulate the mailx(1) compose mode
 -y      show a menu containing the files specified by the mailboxes command
diff --git a/doc/manual.txt b/doc/manual.txt
index 621302b..c1f451e 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -4,7 +4,7 @@
                       by Andreas Krennmair <ak@synflood.at> and others
                 originally based on _m_u_t_t by Michael Elkins <me@cs.hmc.edu> and others
 
-                                        version devel
+                                     version devel-r446
 
                                           AAbbssttrraacctt
 
@@ -316,7 +316,7 @@
             ^G              n/a             abort
             <Return>        n/a             finish editing
 
-       You can remap the _e_d_i_t_o_r functions using the _b_i_n_d (section 3.4  , page 24) com-
+       You can remap the _e_d_i_t_o_r functions using the _b_i_n_d (section 3.5  , page 25) com-
        mand.  For example, to make the _D_e_l_e_t_e key delete the character in front of the
        cursor rather than under, you could use
 
@@ -413,7 +413,7 @@
           +o cclleeaarr--ffllaagg (default: W)
 
        Furthermore, the following flags reflect who the message is addressed to.  They
-       can be customized with the _$_t_o___c_h_a_r_s (section 7.4.327  , page 167) variable.
+       can be customized with the _$_t_o___c_h_a_r_s (section 7.4.328  , page 168) variable.
 
              +
                    message is to you and you only
@@ -461,7 +461,7 @@
        letter again for bold or the letter, backspace, ``_'' for denoting underline.
        Mutt-ng will attempt to display these in bold and underline respectively if
        your terminal supports them. If not, you can use the bold and underline _c_o_l_o_r
-       (section 3.8  , page 28) objects to specify a color or mono attribute for them.
+       (section 3.9  , page 29) objects to specify a color or mono attribute for them.
 
        Additionally, the internal pager supports the ANSI escape sequences for charac-
        ter attributes.  Mutt-ng translates them into the correct color and character
@@ -490,14 +490,14 @@
        The Mutt Next Generation E-Mail Client                                       11
 
        Mutt-ng uses these attributes for handling text/enriched messages, and they can
-       also be used by an external _a_u_t_o_v_i_e_w (section 5.4  , page 76) script for high-
+       also be used by an external _a_u_t_o_v_i_e_w (section 5.4  , page 77) script for high-
        lighting purposes.  NNoottee:: If you change the colors for your display, for exam-
        ple by changing the color associated with color2 for your xterm, then that
        color will be used instead of green.
 
        _2_._5_._3  _T_h_r_e_a_d_e_d _M_o_d_e
 
-       When the mailbox is _s_o_r_t_e_d (section 7.4.295  , page 157) by _t_h_r_e_a_d_s, there are
+       When the mailbox is _s_o_r_t_e_d (section 7.4.296  , page 158) by _t_h_r_e_a_d_s, there are
        a few additional functions available in the _i_n_d_e_x and _p_a_g_e_r modes.
 
             ^D      delete-thread           delete all messages in the current thread
@@ -518,11 +518,11 @@
        NNoottee:: Collapsing a thread displays only the first message in the thread and
        hides the others. This is useful when threads contain so many messages that you
        can only see a handful of threads on the screen. See %M in _$_i_n_d_e_x___f_o_r_m_a_t (sec-
-       tion 7.4.113  , page 113).  For example, you could use "%?M?(#%03M)&(%4l)?" in
-       _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113) to optionally display the number of
+       tion 7.4.114  , page 114).  For example, you could use "%?M?(#%03M)&(%4l)?" in
+       _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114) to optionally display the number of
        hidden messages if the thread is collapsed.
 
-       See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 7.4.316  , page 165).
+       See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 7.4.317  , page 166).
 
        _2_._5_._4  _M_i_s_c_e_l_l_a_n_e_o_u_s _F_u_n_c_t_i_o_n_s
 
@@ -530,11 +530,11 @@
         (default: a)
 
        Creates a new alias based upon the current message (or prompts for a new one).
-       Once editing is complete, an _a_l_i_a_s (section 3.3  , page 23) command is added to
-       the file specified by the _$_a_l_i_a_s___f_i_l_e (section 7.4.4  , page 87) variable for
-       future use. NNoottee:: Specifying an _$_a_l_i_a_s___f_i_l_e (section 7.4.4  , page 87) does not
-       add the aliases specified there-in, you must also _s_o_u_r_c_e (section 3.28  , page
-       43) the file.
+       Once editing is complete, an _a_l_i_a_s (section 3.4  , page 24) command is added to
+       the file specified by the _$_a_l_i_a_s___f_i_l_e (section 7.4.5  , page 88) variable for
+       future use. NNoottee:: Specifying an _$_a_l_i_a_s___f_i_l_e (section 7.4.5  , page 88) does not
+       add the aliases specified there-in, you must also _s_o_u_r_c_e (section 3.29  , page
+       44) the file.
 
        cchheecckk--ttrraaddiittiioonnaall--ppggpp
         (default: ESC P)
@@ -552,7 +552,7 @@
         (default: h)
 
        Toggles the weeding of message header fields specified by _i_g_n_o_r_e (section
-       3.9  , page 30) commands.
+       3.10  , page 31) commands.
 
        eeddiitt
         (default: e)
@@ -570,12 +570,12 @@
        This command is used to temporarily edit an attachment's content type to fix,
        for instance, bogus character set parameters.  When invoked from the index or
        from the pager, you'll have the opportunity to edit the top-level attachment's
-       content type.  On the _a_t_t_a_c_h_m_e_n_t _m_e_n_u (section 5.1.2  , page 68), you can
+       content type.  On the _a_t_t_a_c_h_m_e_n_t _m_e_n_u (section 5.1.2  , page 69), you can
        change any attachment's content type. These changes are not persistent, and get
        lost upon changing folders.
 
        Note that this command is also available on the _c_o_m_p_o_s_e _m_e_n_u (section 5.1.3  ,
-       page 69).  There, it's used to fine-tune the properties of attachments you are
+       page 70).  There, it's used to fine-tune the properties of attachments you are
        going to send.
 
        eenntteerr--ccoommmmaanndd
@@ -583,7 +583,7 @@
 
        This command is used to execute any command you would normally put in a config-
        uration file.  A common use is to check the settings of variables, or in con-
-       junction with _m_a_c_r_o_s (section 3.7  , page 27) to change settings on the fly.
+       junction with _m_a_c_r_o_s (section 3.8  , page 28) to change settings on the fly.
 
        eexxttrraacctt--kkeeyyss
         (default: ^K)
@@ -603,9 +603,9 @@
         (default: L)
 
        Reply to the current or tagged message(s) by extracting any addresses which
-       match the regular expressions given by the _l_i_s_t_s _o_r _s_u_b_s_c_r_i_b_e (section 3.12  ,
-       page 33) commands, but also honor any Mail-Followup-To header(s) if the
-       _$_h_o_n_o_r___f_o_l_l_o_w_u_p___t_o (section 7.4.91  , page 108) configuration variable is set.
+       match the regular expressions given by the _l_i_s_t_s _o_r _s_u_b_s_c_r_i_b_e (section 3.13  ,
+       page 34) commands, but also honor any Mail-Followup-To header(s) if the
+       _$_h_o_n_o_r___f_o_l_l_o_w_u_p___t_o (section 7.4.92  , page 109) configuration variable is set.
        Using this when replying to messages posted to mailing lists helps avoid dupli-
        cate copies being sent to the author of the message you are replying to.
 
@@ -613,9 +613,9 @@
         (default: |)
 
        Asks for an external Unix command and pipes the current or tagged message(s) to
-       it.  The variables _$_p_i_p_e___d_e_c_o_d_e (section 7.4.204  , page 136), _$_p_i_p_e___s_p_l_i_t
-       (section 7.4.206  , page 137), _$_p_i_p_e___s_e_p (section 7.4.205  , page 137) and
-       _$_w_a_i_t___k_e_y (section 7.4.339  , page 169) control the exact behavior of this
+       it.  The variables _$_p_i_p_e___d_e_c_o_d_e (section 7.4.205  , page 138), _$_p_i_p_e___s_p_l_i_t
+       (section 7.4.207  , page 138), _$_p_i_p_e___s_e_p (section 7.4.206  , page 138) and
+       _$_w_a_i_t___k_e_y (section 7.4.339  , page 170) control the exact behavior of this
        function.
 
        rreesseenndd--mmeessssaaggee
@@ -625,7 +625,7 @@
        message.  This function is best described as "recall from arbitrary folders".
        It can conveniently be used to forward MIME messages while preserving the orig-
        inal mail structure. Note that the amount of headers included here depends on
-       the value of the _$_w_e_e_d (section 7.4.340  , page 170) variable.
+       the value of the _$_w_e_e_d (section 7.4.340  , page 171) variable.
 
        This function is also available from the attachment menu. You can use this to
        easily resend a message which was included with a bounce message as a mes-
@@ -635,14 +635,14 @@
         (default: !)
 
        Asks for an external Unix command and executes it.  The _$_w_a_i_t___k_e_y (section
-       7.4.339  , page 169) can be used to control whether Mutt-ng will wait for a key
+       7.4.339  , page 170) can be used to control whether Mutt-ng will wait for a key
        to be pressed when the command returns (presumably to let the user read the
        output of the command), based on the return status of the named command.
 
        ttooggggllee--qquuootteedd
         (default: T)
 
-       The _p_a_g_e_r uses the _$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.229  , page 142) variable to
+       The _p_a_g_e_r uses the _$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.230  , page 143) variable to
        detect quoted text when displaying the body of the message.  This function tog-
        gles the display of the quoted material in the message.  It is particularly
        useful when are interested in just the response and there is a large amount of
@@ -755,7 +755,7 @@
        sages from. You can now tag messages in that folder and they will be attached
        to the message you are sending. Note that certain operations like composing a
        new mail, replying, forwarding, etc. are not permitted when you are in that
-       folder. The %r in _$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.312  , page 162) will change to a
+       folder. The %r in _$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.313  , page 163) will change to a
        'A' to indicate that you are in attach-message mode.
 
        The Mutt Next Generation E-Mail Client                                       16
@@ -863,7 +863,7 @@
        field, Mutt-ng will not generate a _R_e_f_e_r_e_n_c_e_s_: field, which allows you to cre-
        ate a new message thread.
 
-       Also see _e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100).
+       Also see _e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101).
 
        _2_._6_._4  _U_s_i_n_g _M_u_t_t_-_n_g _w_i_t_h _P_G_P
 
@@ -872,7 +872,7 @@
        Pgp: [ E | S | S_<_i_d_> ]
 
        ``E'' encrypts, ``S'' signs and ``S<id>'' signs with the given key, setting
-       _$_p_g_p___s_i_g_n___a_s (section 7.4.196  , page 135) permanently.
+       _$_p_g_p___s_i_g_n___a_s (section 7.4.197  , page 136) permanently.
 
        If you have told mutt to PGP encrypt a message, it will guide you through a key
        selection process when you try to send the message.  Mutt-ng will not ask you
@@ -890,7 +890,7 @@
        encrypted using the selected public keys, and sent out.
 
        Most fields of the entries in the key selection menu (see also _$_p_g_p___e_n_t_r_y___f_o_r_-
-       _m_a_t (section 7.4.183  , page 132)) have obvious meanings.  But some explana-
+       _m_a_t (section 7.4.184  , page 133)) have obvious meanings.  But some explana-
        tions on the capabilities, flags, and validity fields are in order.
 
        The flags sequence (%f) will expand to one of the following flags:
@@ -947,8 +947,8 @@
        leave the menu, or accept them pressing (by default) the Return key.
 
        Note that different remailers do have different capabilities, indicated in the
-       %c entry of the remailer menu lines (see _$_m_i_x___e_n_t_r_y___f_o_r_m_a_t (section 7.4.143  ,
-       page 121)).  Most important is the ``middleman'' capability, indicated by a
+       %c entry of the remailer menu lines (see _$_m_i_x___e_n_t_r_y___f_o_r_m_a_t (section 7.4.144  ,
+       page 122)).  Most important is the ``middleman'' capability, indicated by a
        capital ``M'': This means that the remailer in question cannot be used as the
        final element of a chain, but will only forward messages to other mixmaster
        remailers.  For details on the other capabilities, please have a look at the
@@ -1001,7 +1001,7 @@
        At times it is desirable to delay sending a message that you have already begun
        to compose.  When the _p_o_s_t_p_o_n_e_-_m_e_s_s_a_g_e function is used in the _c_o_m_p_o_s_e menu,
        the body of your message and attachments are stored in the mailbox specified by
-       the _$_p_o_s_t_p_o_n_e_d (section 7.4.218  , page 140) variable.  This means that you can
+       the _$_p_o_s_t_p_o_n_e_d (section 7.4.219  , page 141) variable.  This means that you can
        recall the message even if you exit Mutt-ng and then restart it at a later
        time.
 
@@ -1019,7 +1019,7 @@
        be in the same folder with the message you replied to for the status of the
        message to be updated.
 
-       See also the _$_p_o_s_t_p_o_n_e (section 7.4.217  , page 139) quad-option.
+       See also the _$_p_o_s_t_p_o_n_e (section 7.4.218  , page 141) quad-option.
 
        _3_.  _C_o_n_f_i_g_u_r_a_t_i_o_n
 
@@ -1029,7 +1029,7 @@
        out of the box, it is often desirable to tailor Mutt-ng to suit your own
        tastes. When Mutt-ng is first invoked, it will attempt to read the ``system''
        configuration file (defaults set by your local system administrator), unless
-       the ``-n'' _c_o_m_m_a_n_d _l_i_n_e (section 7.1  , page 80) option is specified.  This
+       the ``-n'' _c_o_m_m_a_n_d _l_i_n_e (section 7.1  , page 81) option is specified.  This
        file is typically /usr/local/share/muttng/Muttngrc or /etc/Muttngrc, Mutt-ng
        users will find this file in /usr/local/share/muttng/Muttrc or /etc/Muttngrc.
        Mutt will next look for a file named .muttrc in your home directory, Mutt-ng
@@ -1037,12 +1037,12 @@
        has a subdirectory named .mutt, mutt try to load a file named .muttng/muttngrc.
 
        .muttrc (or .muttngrc for Mutt-ng) is the file where you will usually place
-       your _c_o_m_m_a_n_d_s (section 7.3  , page 83) to configure Mutt-ng.
+       your _c_o_m_m_a_n_d_s (section 7.3  , page 84) to configure Mutt-ng.
 
-       _3_._2  _S_y_n_t_a_x _o_f _I_n_i_t_i_a_l_i_z_a_t_i_o_n _F_i_l_e_s
+       _3_._2  _B_a_s_i_c _S_y_n_t_a_x _o_f _I_n_i_t_i_a_l_i_z_a_t_i_o_n _F_i_l_e_s
 
        An initialization file consists of a series of _c_o_m_m_a_n_d_s (section 7.3  , page
-       83).  Each line of the file may contain one or more commands.  When multiple
+       84).  Each line of the file may contain one or more commands.  When multiple
        commands are used, they must be separated by a semicolon (;).
 
             set realname='Mutt-ng user' ; ignore x-
@@ -1102,31 +1102,100 @@
        which includes line3 and line4. line5 is a new line of its own and thus is
        interpreted again.
 
-       It is also possible to substitute the output of a Unix command in an initial-
-       ization file.  This is accomplished by enclosing the command in backquotes
-       (``).  For example,
+       The commands understood by mutt are explained in the next paragraphs.  For a
+       complete list, see the _c_o_m_m_a_n_d _r_e_f_e_r_e_n_c_e (section 7.3  , page 84).
 
        The Mutt Next Generation E-Mail Client                                       23
 
+       _3_._3  _V_a_r_i_a_b_l_e _E_x_p_a_n_s_i_o_n
+
+       _3_._3_._1  _C_o_m_m_a_n_d_s_' _O_u_t_p_u_t
+
+       It is possible to substitute the output of a Unix command in an initialization
+       file.  This is accomplished by enclosing the command in backquotes (``) as in,
+       for example:
+
             my_hdr X-Operating-System: `uname -a`
 
        The output of the Unix command ``uname -a'' will be substituted before the line
-       is parsed.  Note that since initialization files are line oriented, only the
+       is parsed. Note that since initialization files are line oriented, only the
        first line of output from the Unix command will be substituted.
 
+       _3_._3_._2  _E_n_v_i_r_o_n_m_e_n_t _V_a_r_i_a_b_l_e_s
+
        UNIX environments can be accessed like the way it is done in shells like sh and
-       bash: Prepend the name of the environment by a ``$''.  For example,
+       bash: Prepend the name of the environment by a ``$'' sign. For example,
 
             set record=+sent_on_$HOSTNAME
 
-       This also applies for all configuration variables known to mutt-ng, for example
+       sets the _$_r_e_c_o_r_d (section 7.4.235  , page 144) variable to the string _+_s_e_n_t___o_n__
+       and appends the value of the evironment variable $HOSTNAME.
+
+       NNoottee:: There will be no warning if an environment variable is not defined. The
+       result will of the expansion will then be empty.
+
+       _3_._3_._3  _C_o_n_f_i_g_u_r_a_t_i_o_n _V_a_r_i_a_b_l_e_s
+
+       As for environment variables, the values of all configuration variables as
+       string can be used in the same way, too. For example,
 
             set imap_home_namespace = $folder
 
-       The commands understood by mutt are explained in the next paragraphs.  For a
-       complete list, see the _c_o_m_m_a_n_d _r_e_f_e_r_e_n_c_e (section 7.3  , page 83).
+       would set the value of _$_i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e (section 7.4.99  , page 110) to the
+       value to which _$_f_o_l_d_e_r (section 7.4.68  , page 103) is _c_u_r_r_e_n_t_l_y set to.
+
+       NNoottee:: There're no logical links established in such cases so that the the value
+       for _$_i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e (section 7.4.99  , page 110) won't change even if
+       _$_f_o_l_d_e_r (section 7.4.68  , page 103) gets changed.
+
+       NNoottee:: There will be no warning if a configuration variable is not defined or is
+       empty. The result will of the expansion will then be empty.
+
+       _3_._3_._4  _S_e_l_f_-_D_e_f_i_n_e_d _V_a_r_i_a_b_l_e_s
+
+       Mutt-ng flexibly allows users to define their own variables. To avoid conflicts
+       with the standard set and to prevent misleading error messages, there's a
+
+       The Mutt Next Generation E-Mail Client                                       24
 
-       _3_._3  _D_e_f_i_n_i_n_g_/_U_s_i_n_g _a_l_i_a_s_e_s
+       reserved namespace for them. All user-defined variables must be prefixed with
+       user_ and can be used just like any ordinary configuration or environment vari-
+       able.
+
+       For example, to view the manual, users can either define three macros like the
+       following
+
+            macro generic <F1> "!less -r /path/to/manual" "Show manual"
+            macro pager <F1> "!less -r /path/to/manual" "Show manual"
+            macro index <F1> "!less -r /path/to/manual" "Show manual"
+
+       for generic, pager and index. The alternative is to define a custom variable
+       like so:
+
+            set user_manualcmd = '!less -r /path/to_manual"
+            macro generic <F1> "$user_manualcmd<enter>" "Show manual"
+            macro pager <F1> "$user_manualcmd<enter>" "Show manual"
+            macro index <F1> "$user_manualcmd<enter>" "Show manual"
+
+       Using this feature, arbitrary sequences can be defined once and recalled and
+       reused where necessary. More advanced scenarios could include to save a vari-
+       able's value at the beginning of macro sequence and restore it at end.
+
+       _3_._3_._5  _T_y_p_e _C_o_n_v_e_r_s_i_o_n_s
+
+       A note about variable's types during conversion: internally values are stored
+       in internal types but for any dump/query or set operation they're converted to
+       and from string. That means that there's no need to worry about types when ref-
+       erencing any variable.  As an example, the following can be used without harm
+       (besides makeing muttng very likely behave strange):
+
+            set read_inc = 100
+            set folder = $read_inc
+            set $read_inc = $folder
+            set user_magic_number = 42
+            set folder = $user_magic_number
+
+       _3_._4  _D_e_f_i_n_i_n_g_/_U_s_i_n_g _a_l_i_a_s_e_s
 
        Usage: alias _k_e_y _a_d_d_r_e_s_s [ , _a_d_d_r_e_s_s, ... ]
 
@@ -1137,6 +1206,8 @@
        NNoottee:: if you want to create an alias for a group (by specifying more than one
        address), you mmuusstt separate the addresses with a comma (``,'').
 
+       The Mutt Next Generation E-Mail Client                                       25
+
        To remove an alias or aliases (``*'' means all aliases):
 
        unalias [ * | _k_e_y _._._. ]
@@ -1146,17 +1217,15 @@
 
        Unlike other mailers, Mutt-ng doesn't require aliases to be defined in a spe-
        cial file.  The alias command can appear anywhere in a configuration file, as
-       long as this file is _s_o_u_r_c_e_d (section 3.28  , page 43).  Consequently, you can
+       long as this file is _s_o_u_r_c_e_d (section 3.29  , page 44).  Consequently, you can
        have multiple alias files, or you can have all aliases defined in your muttrc.
 
        On the other hand, the _c_r_e_a_t_e_-_a_l_i_a_s (section 2.5.4  , page 11) function can use
-       only one file, the one pointed to by the _$_a_l_i_a_s___f_i_l_e (section 7.4.4  , page 87)
+       only one file, the one pointed to by the _$_a_l_i_a_s___f_i_l_e (section 7.4.5  , page 88)
        variable (which is ~/.muttrc by default). This file is not special either, in
        the sense that Mutt-ng will happily append aliases to any file, but in order
        for the new aliases to take effect you need to explicitly _s_o_u_r_c_e (section
-       3.28  , page 43) this file too.
-
-       The Mutt Next Generation E-Mail Client                                       24
+       3.29  , page 44) this file too.
 
        For example:
 
@@ -1167,7 +1236,7 @@
        To use aliases, you merely use the alias at any place in mutt where mutt
        prompts for addresses, such as the _T_o_: or _C_c_: prompt.  You can also enter
        aliases in your editor at the appropriate headers if you have the _$_e_d_i_t___h_e_a_d_e_r_s
-       (section 7.4.57  , page 100) variable set.
+       (section 7.4.58  , page 101) variable set.
 
        In addition, at the various address prompts, you can use the tab character to
        expand a partial alias to the full alias.  If there are multiple matches, mutt
@@ -1179,16 +1248,19 @@
        _e_n_t_r_y key (default: RET), and use the _e_x_i_t key (default: q) to return to the
        address prompt.
 
-       _3_._4  _C_h_a_n_g_i_n_g _t_h_e _d_e_f_a_u_l_t _k_e_y _b_i_n_d_i_n_g_s
+       _3_._5  _C_h_a_n_g_i_n_g _t_h_e _d_e_f_a_u_l_t _k_e_y _b_i_n_d_i_n_g_s
 
        Usage: bind _m_a_p _k_e_y _f_u_n_c_t_i_o_n
 
        This command allows you to change the default key bindings (operation invoked
        when pressing a key).
 
-       _m_a_p specifies in which menu the binding belongs.  Multiple maps may be speci-
-       fied by separating them with commas (no additional whitespace is allowed). The
-       currently defined maps are:
+       _m_a_p specifies in which menu the binding belongs.  Multiple maps may be
+
+       The Mutt Next Generation E-Mail Client                                       26
+
+       specified by separating them with commas (no additional whitespace is allowed).
+       The currently defined maps are:
 
              generic
                    This is not a real menu, but is used as a fallback for all of the
@@ -1207,8 +1279,6 @@
                    The attachment menu is used to access the attachments on received
                    messages.
 
-       The Mutt Next Generation E-Mail Client                                       25
-
              browser
                    The browser is used for both browsing the local directory struc-
                    ture, and for listing all of your incoming mailboxes.
@@ -1241,9 +1311,9 @@
        alternative form is to specify the key as a three digit octal number prefixed
        with a ``\'' (for example _\_1_7_7 is equivalent to _\_c_?).
 
-       In addition, _k_e_y may consist of:
+       The Mutt Next Generation E-Mail Client                                       27
 
-       The Mutt Next Generation E-Mail Client                                       26
+       In addition, _k_e_y may consist of:
 
             \t              tab
             <tab>           tab
@@ -1272,10 +1342,10 @@
        _k_e_y does not need to be enclosed in quotes unless it contains a space (`` '').
 
        _f_u_n_c_t_i_o_n specifies which action to take when _k_e_y is pressed.  For a complete
-       list of functions, see the _r_e_f_e_r_e_n_c_e (section 7.5  , page 171).  The special
+       list of functions, see the _r_e_f_e_r_e_n_c_e (section 7.5  , page 172).  The special
        function noop unbinds the specified key sequence.
 
-       _3_._5  _D_e_f_i_n_i_n_g _a_l_i_a_s_e_s _f_o_r _c_h_a_r_a_c_t_e_r _s_e_t_s
+       _3_._6  _D_e_f_i_n_i_n_g _a_l_i_a_s_e_s _f_o_r _c_h_a_r_a_c_t_e_r _s_e_t_s
 
        Usage: charset-hook _a_l_i_a_s _c_h_a_r_s_e_t
 
@@ -1289,21 +1359,20 @@
        This is helpful when your systems character conversion library insists on using
        strange, system-specific names for character sets.
 
-       _3_._6  _S_e_t_t_i_n_g _v_a_r_i_a_b_l_e_s _b_a_s_e_d _u_p_o_n _m_a_i_l_b_o_x
+       _3_._7  _S_e_t_t_i_n_g _v_a_r_i_a_b_l_e_s _b_a_s_e_d _u_p_o_n _m_a_i_l_b_o_x
 
-       Usage: folder-hook [!]_r_e_g_e_x_p _c_o_m_m_a_n_d
-
-       It is often desirable to change settings based on which mailbox you are
+       The Mutt Next Generation E-Mail Client                                       28
 
-       The Mutt Next Generation E-Mail Client                                       27
+       Usage: folder-hook [!]_r_e_g_e_x_p _c_o_m_m_a_n_d
 
-       reading.  The folder-hook command provides a method by which you can execute
-       any configuration command.  _r_e_g_e_x_p is a regular expression specifying in which
+       It is often desirable to change settings based on which mailbox you are read-
+       ing.  The folder-hook command provides a method by which you can execute any
+       configuration command.  _r_e_g_e_x_p is a regular expression specifying in which
        mailboxes to execute _c_o_m_m_a_n_d before loading.  If a mailbox matches multiple
        folder-hook's, they are executed in the order given in the muttrc.
 
-       NNoottee:: if you use the ``!'' shortcut for _$_s_p_o_o_l_f_i_l_e (section 7.4.301  , page
-       159) at the beginning of the pattern, you must place it inside of double or
+       NNoottee:: if you use the ``!'' shortcut for _$_s_p_o_o_l_f_i_l_e (section 7.4.302  , page
+       160) at the beginning of the pattern, you must place it inside of double or
        single quotes in order to distinguish it from the logical _n_o_t operator for the
        expression.
 
@@ -1318,7 +1387,7 @@
 
             folder-hook . set sort=date-sent
 
-       _3_._7  _K_e_y_b_o_a_r_d _m_a_c_r_o_s
+       _3_._8  _K_e_y_b_o_a_r_d _m_a_c_r_o_s
 
        Usage: macro _m_e_n_u _k_e_y _s_e_q_u_e_n_c_e [ _d_e_s_c_r_i_p_t_i_o_n ]
 
@@ -1327,27 +1396,27 @@
        typed _s_e_q_u_e_n_c_e.  So if you have a common sequence of commands you type, you can
        create a macro to execute those commands with a single key.
 
-       _m_e_n_u is the _m_a_p (section 3.4  , page 24) which the macro will be bound.  Multi-
+       _m_e_n_u is the _m_a_p (section 3.5  , page 26) which the macro will be bound.  Multi-
        ple maps may be specified by separating multiple menu arguments by commas.
        Whitespace may not be used in between the menu arguments and the commas sepa-
        rating them.
 
        _k_e_y and _s_e_q_u_e_n_c_e are expanded by the same rules as the _k_e_y _b_i_n_d_i_n_g_s (section
-       3.4  , page 24).  There are some additions however.  The first is that control
+       3.5  , page 25).  There are some additions however.  The first is that control
        characters in _s_e_q_u_e_n_c_e can also be specified as _^_x.  In order to get a caret
        (`^'') you need to use _^_^.  Secondly, to specify a certain key such as _u_p or to
        invoke a function directly, you can use the format _<_k_e_y _n_a_m_e_> and _<_f_u_n_c_t_i_o_n
        _n_a_m_e_>.  For a listing of key names see the section on _k_e_y _b_i_n_d_i_n_g_s (section
-       3.4  , page 24).  Functions are listed in the _f_u_n_c_t_i_o_n _r_e_f_e_r_e_n_c_e (section
-       7.5  , page 171).
+       3.5  , page 25).  Functions are listed in the _f_u_n_c_t_i_o_n _r_e_f_e_r_e_n_c_e (section
+       7.5  , page 172).
 
        The advantage with using function names directly is that the macros will work
+
+       The Mutt Next Generation E-Mail Client                                       29
+
        regardless of the current key bindings, so they are not dependent on the user
        having particular key definitions.  This makes them more robust and portable,
        and also facilitates defining of macros in files used by more than one user
-
-       The Mutt Next Generation E-Mail Client                                       28
-
        (eg. the system Muttngrc).
 
        Optionally you can specify a descriptive text after _s_e_q_u_e_n_c_e, which is shown in
@@ -1356,7 +1425,7 @@
        NNoottee:: Macro definitions (if any) listed in the help screen(s), are silently
        truncated at the screen width, and are not wrapped.
 
-       _3_._8  _U_s_i_n_g _c_o_l_o_r _a_n_d _m_o_n_o _v_i_d_e_o _a_t_t_r_i_b_u_t_e_s
+       _3_._9  _U_s_i_n_g _c_o_l_o_r _a_n_d _m_o_n_o _v_i_d_e_o _a_t_t_r_i_b_u_t_e_s
 
        Usage: color _o_b_j_e_c_t _f_o_r_e_g_r_o_u_n_d _b_a_c_k_g_r_o_u_n_d [ _r_e_g_e_x_p ]
 
@@ -1393,15 +1462,15 @@
 
           +o normal
 
-          +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.229  , page 142) in the
+          +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.230  , page 143) in the
             body of a message)
 
+       The Mutt Next Generation E-Mail Client                                       30
+
           +o quoted1, quoted2, ..., quotedNN (higher levels of quoting)
 
           +o search (highlighting of words in the pager)
 
-       The Mutt Next Generation E-Mail Client                                       29
-
           +o signature
 
           +o status (mode lines used to display info about the mailbox or message)
@@ -1450,12 +1519,13 @@
        instead of _w_h_i_t_e and _y_e_l_l_o_w when setting this variable.
 
        NNoottee:: The uncolor command can be applied to the index object only.  It removes
+
+       The Mutt Next Generation E-Mail Client                                       31
+
        entries from the list. You mmuusstt specify the same pattern specified in the color
        command for it to be removed.  The pattern ``*'' is a special token which means
        to clear the color index list of all entries.
 
-       The Mutt Next Generation E-Mail Client                                       30
-
        Mutt-ng also recognizes the keywords _c_o_l_o_r_0, _c_o_l_o_r_1, ..., _c_o_l_o_rNN--11 (NN being the
        number of colors supported by your terminal).  This is useful when you remap
        the colors for your display (for example by changing the color associated with
@@ -1482,7 +1552,7 @@
 
           +o standout
 
-       _3_._9  _I_g_n_o_r_i_n_g _(_w_e_e_d_i_n_g_) _u_n_w_a_n_t_e_d _m_e_s_s_a_g_e _h_e_a_d_e_r_s
+       _3_._1_0  _I_g_n_o_r_i_n_g _(_w_e_e_d_i_n_g_) _u_n_w_a_n_t_e_d _m_e_s_s_a_g_e _h_e_a_d_e_r_s
 
        Usage: [un]ignore _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
@@ -1503,15 +1573,15 @@
 
        For example:
 
+       The Mutt Next Generation E-Mail Client                                       32
+
             # Sven's draconian header weeding
             ignore *
             unignore from date subject to cc
             unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
             unignore posted-to:
 
-       The Mutt Next Generation E-Mail Client                                       31
-
-       _3_._1_0  _A_l_t_e_r_n_a_t_i_v_e _a_d_d_r_e_s_s_e_s
+       _3_._1_1  _A_l_t_e_r_n_a_t_i_v_e _a_d_d_r_e_s_s_e_s
 
        Usage: [un]alternates _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
@@ -1520,7 +1590,7 @@
        instance, when replying to a message that you sent to a different party, mutt
        will automatically suggest to send the response to the original message's
        recipients -- responding to yourself won't make much sense in many cases.  (See
-       _$_r_e_p_l_y___t_o (section 7.4.237  , page 144).)
+       _$_r_e_p_l_y___t_o (section 7.4.238  , page 145).)
 
        Many users receive e-mail under a number of different addresses. To fully use
        mutt's features here, the program must be able to recognize what e-mail
@@ -1539,9 +1609,9 @@
        be removed. If the _r_e_g_e_x_p for unalternates is ``*'', _a_l_l _e_n_t_r_i_e_s on alternates
        will be removed.
 
-       _3_._1_1  _F_o_r_m_a_t _= _F_l_o_w_e_d
+       _3_._1_2  _F_o_r_m_a_t _= _F_l_o_w_e_d
 
-       _3_._1_1_._1  _I_n_t_r_o_d_u_c_t_i_o_n
+       _3_._1_2_._1  _I_n_t_r_o_d_u_c_t_i_o_n
 
        Mutt-ng contains support for so-called format=flowed messages.  In the begin-
        ning of email, each message had a fixed line width, and it was enough for dis-
@@ -1554,17 +1624,18 @@
        fixed-size terminals.
 
        For introductory information on format=flowed messages, see
+
+       The Mutt Next Generation E-Mail Client                                       33
+
        <http://www.joeclark.org/ffaq.html>.
 
-       _3_._1_1_._2  _R_e_c_e_i_v_i_n_g_: _D_i_s_p_l_a_y _S_e_t_u_p
+       _3_._1_2_._2  _R_e_c_e_i_v_i_n_g_: _D_i_s_p_l_a_y _S_e_t_u_p
 
        When you receive emails that are marked as format=flowed messages, and is for-
        matted correctly, mutt-ng will try to reformat the message to optimally fit on
        your terminal. If you want a fixed margin on the right side of your terminal,
        you can set the following:
 
-       The Mutt Next Generation E-Mail Client                                       32
-
                 set wrapmargin = 10
 
        The code above makes the line break 10 columns before the right side of the
@@ -1598,15 +1669,15 @@
                 > production server that we want to set up before our customer's
                 > project will go live.
 
-       _3_._1_1_._3  _S_e_n_d_i_n_g
+       The Mutt Next Generation E-Mail Client                                       34
+
+       _3_._1_2_._3  _S_e_n_d_i_n_g
 
        If you want mutt-ng to send emails with format=flowed set, you need to explic-
        itly set it:
 
                 set text_flowed
 
-       The Mutt Next Generation E-Mail Client                                       33
-
        Additionally, you have to use an editor which supports writing format=flowed-
        conforming emails. For vim, this is done by adding w to the formatoptions (see
        :h formatoptions and :h fo-table) when writing emails.
@@ -1627,11 +1698,11 @@
 
        Please make sure that you manually prepend a space to each of them.
 
-       _3_._1_1_._4  _A_d_d_i_t_i_o_n_a_l _N_o_t_e_s
+       _3_._1_2_._4  _A_d_d_i_t_i_o_n_a_l _N_o_t_e_s
 
            "
 
-        For completeness, the _$_d_e_l_e_t_e___s_p_a_c_e (section 7.4.49  , page 98) variable pro-
+        For completeness, the _$_d_e_l_e_t_e___s_p_a_c_e (section 7.4.50  , page 99) variable pro-
        vides the mechanism to generate a DelSp=yes parameter on _o_u_t_g_o_i_n_g messages.
        According to the standard, clients receiving a format=flowed messages should
        delete the last space of a flowed line but still interpret the line as flowed.
@@ -1641,14 +1712,17 @@
        able and is intended for languages rarely using spaces. So please use this set-
        ting only if you're sure what you're doing.
 
-       _3_._1_2  _M_a_i_l_i_n_g _l_i_s_t_s
+       _3_._1_3  _M_a_i_l_i_n_g _l_i_s_t_s
 
        Usage: [un]lists _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
        Usage: [un]subscribe _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
        Mutt-ng has a few nice features for _h_a_n_d_l_i_n_g _m_a_i_l_i_n_g _l_i_s_t_s (section 4.10  ,
-       page 58).  In order to take advantage of them, you must specify which addresses
+       page 59).  In order to take advantage of them, you must specify which addresses
+
+       The Mutt Next Generation E-Mail Client                                       35
+
        belong to mailing lists, and which mailing lists you are subscribed to.  Once
        you have done this, the _l_i_s_t_-_r_e_p_l_y (section 2.5.4  , page 12) function will
        work for all known lists.  Additionally, when you send a message to a sub-
@@ -1657,11 +1731,9 @@
        the Mail-Followup-To header is a non-standard extension which is not supported
        by all mail user agents.  Adding it is not bullet-proof against receiving per-
        sonal CCs of list messages.  Also note that the generation of the Mail-Fol-
-       lowup-To header is controlled by the _$_f_o_l_l_o_w_u_p___t_o (section 7.4.69  , page 103)
+       lowup-To header is controlled by the _$_f_o_l_l_o_w_u_p___t_o (section 7.4.70  , page 104)
        configuration variable.
 
-       The Mutt Next Generation E-Mail Client                                       34
-
        More precisely, Mutt-ng maintains lists of patterns for the addresses of known
        and subscribed mailing lists.  Every subscribed mailing list is known. To mark
        a mailing list as known, use the ``lists'' command.  To mark it as subscribed,
@@ -1688,7 +1760,7 @@
        To remove a mailing list from the list of subscribed mailing lists, but keep it
        on the list of known mailing lists, use ``unsubscribe''.
 
-       _3_._1_3  _U_s_i_n_g _M_u_l_t_i_p_l_e _s_p_o_o_l _m_a_i_l_b_o_x_e_s
+       _3_._1_4  _U_s_i_n_g _M_u_l_t_i_p_l_e _s_p_o_o_l _m_a_i_l_b_o_x_e_s
 
        Usage: mbox-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x
 
@@ -1700,7 +1772,9 @@
        Unlike some of the other _h_o_o_k commands, only the _f_i_r_s_t matching pattern is used
        (it is not possible to save read mail in more than a single mailbox).
 
-       _3_._1_4  _D_e_f_i_n_i_n_g _m_a_i_l_b_o_x_e_s _w_h_i_c_h _r_e_c_e_i_v_e _m_a_i_l
+       The Mutt Next Generation E-Mail Client                                       36
+
+       _3_._1_5  _D_e_f_i_n_i_n_g _m_a_i_l_b_o_x_e_s _w_h_i_c_h _r_e_c_e_i_v_e _m_a_i_l
 
        Usage: [un]mailboxes [!]_f_i_l_e_n_a_m_e [ _f_i_l_e_n_a_m_e ... ]
 
@@ -1712,9 +1786,6 @@
 
        Pressing TAB in the directory browser will bring up a menu showing the files
        specified by the mailboxes command, and indicate which contain new messages.
-
-       The Mutt Next Generation E-Mail Client                                       35
-
        Mutt-ng will automatically enter this mode when invoked from the command line
        with the -y option.
 
@@ -1729,11 +1800,11 @@
 
        NNoottee:: the filenames in the mailboxes command are resolved when the command is
        executed, so if these names contain _s_h_o_r_t_c_u_t _c_h_a_r_a_c_t_e_r_s (section 4.9  , page
-       58) (such as ``='' and ``!''), any variable definition that affect these char-
-       acters (like _$_f_o_l_d_e_r (section 7.4.67  , page 102) and _$_s_p_o_o_l_f_i_l_e (section
-       7.4.301  , page 159)) should be executed before the mailboxes command.
+       59) (such as ``='' and ``!''), any variable definition that affect these char-
+       acters (like _$_f_o_l_d_e_r (section 7.4.68  , page 103) and _$_s_p_o_o_l_f_i_l_e (section
+       7.4.302  , page 160)) should be executed before the mailboxes command.
 
-       _3_._1_5  _U_s_e_r _d_e_f_i_n_e_d _h_e_a_d_e_r_s
+       _3_._1_6  _U_s_e_r _d_e_f_i_n_e_d _h_e_a_d_e_r_s
 
        Usage:
 
@@ -1753,10 +1824,13 @@
 
        NNoottee::  space characters are _n_o_t allowed between the keyword and the colon
        (``:'').  The standard for electronic mail (RFC822) says that space is illegal
+
+       The Mutt Next Generation E-Mail Client                                       37
+
        there, so Mutt-ng enforces the rule.
 
        If you would like to add a header field to a single message, you should either
-       set the _e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100) variable, or use the _e_d_i_t_-
+       set the _e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101) variable, or use the _e_d_i_t_-
        _h_e_a_d_e_r_s function (default: ``E'') in the send-menu so that you can edit the
        header of your message along with the body.
 
@@ -1765,11 +1839,9 @@
        remove.  For example, to remove all ``To'' and ``Cc'' header fields, you could
        use:
 
-       The Mutt Next Generation E-Mail Client                                       36
-
             unmy_hdr to cc
 
-       _3_._1_6  _D_e_f_i_n_i_n_g _t_h_e _o_r_d_e_r _o_f _h_e_a_d_e_r_s _w_h_e_n _v_i_e_w_i_n_g _m_e_s_s_a_g_e_s
+       _3_._1_7  _D_e_f_i_n_i_n_g _t_h_e _o_r_d_e_r _o_f _h_e_a_d_e_r_s _w_h_e_n _v_i_e_w_i_n_g _m_e_s_s_a_g_e_s
 
        Usage: hdr_order _h_e_a_d_e_r_1 _h_e_a_d_e_r_2 _h_e_a_d_e_r_3
 
@@ -1781,7 +1853,7 @@
 
             hdr_order From Date: From: To: Cc: Subject:
 
-       _3_._1_7  _S_p_e_c_i_f_y _d_e_f_a_u_l_t _s_a_v_e _f_i_l_e_n_a_m_e
+       _3_._1_8  _S_p_e_c_i_f_y _d_e_f_a_u_l_t _s_a_v_e _f_i_l_e_n_a_m_e
 
        Usage: save-hook [!]_p_a_t_t_e_r_n _f_i_l_e_n_a_m_e
 
@@ -1790,7 +1862,7 @@
        an address matching _r_e_g_e_x_p or if you are the author and the message is
        addressed _t_o_: something matching _r_e_g_e_x_p.
 
-       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 55) for information on the
+       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 56) for information on the
        exact format of _p_a_t_t_e_r_n.
 
        Examples:
@@ -1798,37 +1870,37 @@
             save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins
             save-hook aol\\.com$ +spam
 
-       Also see the _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.19  , page 37) command.
+       Also see the _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.20  , page 38) command.
+
+       The Mutt Next Generation E-Mail Client                                       38
 
-       _3_._1_8  _S_p_e_c_i_f_y _d_e_f_a_u_l_t _F_c_c_: _m_a_i_l_b_o_x _w_h_e_n _c_o_m_p_o_s_i_n_g
+       _3_._1_9  _S_p_e_c_i_f_y _d_e_f_a_u_l_t _F_c_c_: _m_a_i_l_b_o_x _w_h_e_n _c_o_m_p_o_s_i_n_g
 
        Usage: fcc-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x
 
        This command is used to save outgoing mail in a mailbox other than _$_r_e_c_o_r_d
-       (section 7.4.234  , page 143).  Mutt-ng searches the initial list of message
+       (section 7.4.235  , page 144).  Mutt-ng searches the initial list of message
        recipients for the first matching _r_e_g_e_x_p and uses _m_a_i_l_b_o_x as the default Fcc:
        mailbox.  If no match is found the message will be saved to _$_r_e_c_o_r_d (section
-       7.4.234  , page 143) mailbox.
+       7.4.235  , page 144) mailbox.
 
-       The Mutt Next Generation E-Mail Client                                       37
-
-       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 55) for information on the
+       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 56) for information on the
        exact format of _p_a_t_t_e_r_n.
 
        Example: fcc-hook [@.]aol\\.com$ +spammers
 
        The above will save a copy of all messages going to the aol.com domain to the
-       `+spammers' mailbox by default.  Also see the _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.19  ,
-       page 37) command.
+       `+spammers' mailbox by default.  Also see the _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.20  ,
+       page 38) command.
 
-       _3_._1_9  _S_p_e_c_i_f_y _d_e_f_a_u_l_t _s_a_v_e _f_i_l_e_n_a_m_e _a_n_d _d_e_f_a_u_l_t _F_c_c_: _m_a_i_l_b_o_x _a_t _o_n_c_e
+       _3_._2_0  _S_p_e_c_i_f_y _d_e_f_a_u_l_t _s_a_v_e _f_i_l_e_n_a_m_e _a_n_d _d_e_f_a_u_l_t _F_c_c_: _m_a_i_l_b_o_x _a_t _o_n_c_e
 
        Usage: fcc-save-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x
 
        This command is a shortcut, equivalent to doing both a _f_c_c_-_h_o_o_k (section
-       3.18  , page 36) and a _s_a_v_e_-_h_o_o_k (section 3.17  , page 36) with its arguments.
+       3.19  , page 38) and a _s_a_v_e_-_h_o_o_k (section 3.18  , page 37) with its arguments.
 
-       _3_._2_0  _C_h_a_n_g_e _s_e_t_t_i_n_g_s _b_a_s_e_d _u_p_o_n _m_e_s_s_a_g_e _r_e_c_i_p_i_e_n_t_s
+       _3_._2_1  _C_h_a_n_g_e _s_e_t_t_i_n_g_s _b_a_s_e_d _u_p_o_n _m_e_s_s_a_g_e _r_e_c_i_p_i_e_n_t_s
 
        Usage: reply-hook [!]_p_a_t_t_e_r_n _c_o_m_m_a_n_d
 
@@ -1849,25 +1921,24 @@
        send2-hook is matched every time a message is changed, either by editing it, or
        by using the compose menu to change its recipients or subject.  send2-hook is
        executed after send-hook, and can, e.g., be used to set parameters such as the
-       _$_s_e_n_d_m_a_i_l (section 7.4.251  , page 147) variable depending on the message's
+       _$_s_e_n_d_m_a_i_l (section 7.4.252  , page 148) variable depending on the message's
        sender address.
 
+       The Mutt Next Generation E-Mail Client                                       39
+
        For each type of send-hook or reply-hook, when multiple matches occur, commands
        are executed in the order they are specified in the muttrc (for that type of
        hook).
 
-       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 55) for information on the
+       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 56) for information on the
        exact format of _p_a_t_t_e_r_n.
 
        Example: send-hook mutt 'set mime_forward signature='''
 
-       Another typical use for this command is to change the values of the
-
-       The Mutt Next Generation E-Mail Client                                       38
-
-       _$_a_t_t_r_i_b_u_t_i_o_n (section 7.4.17  , page 91), _$_s_i_g_n_a_t_u_r_e (section 7.4.263  , page
-       150) and _$_l_o_c_a_l_e (section 7.4.117  , page 116) variables in order to change the
-       language of the attributions and signatures based upon the recipients.
+       Another typical use for this command is to change the values of the _$_a_t_t_r_i_b_u_-
+       _t_i_o_n (section 7.4.18  , page 92), _$_s_i_g_n_a_t_u_r_e (section 7.4.264  , page 151) and
+       _$_l_o_c_a_l_e (section 7.4.118  , page 117) variables in order to change the language
+       of the attributions and signatures based upon the recipients.
 
        NNoottee:: the send-hook's are only executed ONCE after getting the initial list of
        recipients.  Adding a recipient after replying or editing the message will NOT
@@ -1875,7 +1946,7 @@
        ify recipient headers, or the message's subject, don't have any effect on the
        current message when executed from a send-hook.
 
-       _3_._2_1  _C_h_a_n_g_e _s_e_t_t_i_n_g_s _b_e_f_o_r_e _f_o_r_m_a_t_t_i_n_g _a _m_e_s_s_a_g_e
+       _3_._2_2  _C_h_a_n_g_e _s_e_t_t_i_n_g_s _b_e_f_o_r_e _f_o_r_m_a_t_t_i_n_g _a _m_e_s_s_a_g_e
 
        Usage: message-hook [!]_p_a_t_t_e_r_n _c_o_m_m_a_n_d
 
@@ -1885,7 +1956,7 @@
        tiple matches occur, commands are executed in the order they are specified in
        the muttrc.
 
-       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 55) for information on the
+       See _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s (section 4.5.1  , page 56) for information on the
        exact format of _p_a_t_t_e_r_n.
 
        Example:
@@ -1893,7 +1964,7 @@
             message-hook ~A 'set pager=builtin'
             message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject: .*\""'
 
-       _3_._2_2  _C_h_o_o_s_i_n_g _t_h_e _c_r_y_p_t_o_g_r_a_p_h_i_c _k_e_y _o_f _t_h_e _r_e_c_i_p_i_e_n_t
+       _3_._2_3  _C_h_o_o_s_i_n_g _t_h_e _c_r_y_p_t_o_g_r_a_p_h_i_c _k_e_y _o_f _t_h_e _r_e_c_i_p_i_e_n_t
 
        Usage: crypt-hook _p_a_t_t_e_r_n _k_e_y_i_d
 
@@ -1904,31 +1975,29 @@
        crypt-hook command provides a method by which you can specify the ID of the
        public key to be used when encrypting messages to a certain recipient.
 
+       The Mutt Next Generation E-Mail Client                                       40
+
        The meaning of "key id" is to be taken broadly in this context:  You can either
        put a numerical key ID here, an e-mail address, or even just a real name.
 
-       _3_._2_3  _A_d_d_i_n_g _k_e_y _s_e_q_u_e_n_c_e_s _t_o _t_h_e _k_e_y_b_o_a_r_d _b_u_f_f_e_r
+       _3_._2_4  _A_d_d_i_n_g _k_e_y _s_e_q_u_e_n_c_e_s _t_o _t_h_e _k_e_y_b_o_a_r_d _b_u_f_f_e_r
 
        Usage: push _s_t_r_i_n_g
 
-       This command adds the named string to the keyboard buffer. The string may
-
-       The Mutt Next Generation E-Mail Client                                       39
+       This command adds the named string to the keyboard buffer. The string may con-
+       tain control characters, key names and function names like the sequence string
+       in the _m_a_c_r_o (section 3.8  , page 28) command. You may use it to automatically
+       run a sequence of commands at startup, or when entering certain folders.
 
-       contain control characters, key names and function names like the sequence
-       string in the _m_a_c_r_o (section 3.7  , page 27) command. You may use it to auto-
-       matically run a sequence of commands at startup, or when entering certain fold-
-       ers.
-
-       _3_._2_4  _E_x_e_c_u_t_i_n_g _f_u_n_c_t_i_o_n_s
+       _3_._2_5  _E_x_e_c_u_t_i_n_g _f_u_n_c_t_i_o_n_s
 
        Usage: exec _f_u_n_c_t_i_o_n [ _f_u_n_c_t_i_o_n ... ]
 
        This command can be used to execute any function. Functions are listed in the
-       _f_u_n_c_t_i_o_n _r_e_f_e_r_e_n_c_e (section 7.5  , page 171).  ``exec function'' is equivalent
+       _f_u_n_c_t_i_o_n _r_e_f_e_r_e_n_c_e (section 7.5  , page 172).  ``exec function'' is equivalent
        to ``push <function>''.
 
-       _3_._2_5  _M_e_s_s_a_g_e _S_c_o_r_i_n_g
+       _3_._2_6  _M_e_s_s_a_g_e _S_c_o_r_i_n_g
 
        Usage: score _p_a_t_t_e_r_n _v_a_l_u_e
 
@@ -1953,6 +2022,8 @@
 
             score "~f santaclaus@northpole\.int" =666
 
+       The Mutt Next Generation E-Mail Client                                       41
+
        What is important to note is that negative score values will be rounded up to
        0.
 
@@ -1962,8 +2033,6 @@
           +o flag threshold: when a message has a score value equal or higher than the
             flag threshold, it will be flagged.
 
-       The Mutt Next Generation E-Mail Client                                       40
-
           +o read threshold: when a message has a score value equal or lower than the
             read threshold, it will be marked as read.
 
@@ -1971,10 +2040,10 @@
             delete threshold, it will be marked as deleted.
 
        These three thresholds can be set via the variables _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g (sec-
-       tion 7.4.248  , page 147), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.249  , page 147),
-       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.247  , page 146) and.  By default,
-       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.249  , page 147) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
-       (section 7.4.247  , page 146) are set to -1, which means that in the default
+       tion 7.4.249  , page 148), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.250  , page 148),
+       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.248  , page 148) and.  By default,
+       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.250  , page 148) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
+       (section 7.4.248  , page 148) are set to -1, which means that in the default
        threshold configuration no message will ever get marked as read or deleted.
 
        Scoring gets especially interesting when combined with the color command and
@@ -1988,7 +2057,7 @@
        This might be unusual to you if you're used to e.g. slrn's scoring mechanism,
        but it is more flexible, as it visually marks different scores.
 
-       _3_._2_6  _S_p_a_m _d_e_t_e_c_t_i_o_n
+       _3_._2_7  _S_p_a_m _d_e_t_e_c_t_i_o_n
 
        Usage: spam _p_a_t_t_e_r_n _f_o_r_m_a_t
 
@@ -1998,13 +2067,16 @@
        your spam patterns with the spam and nospam commands, you can _l_i_m_i_t, _s_e_a_r_c_h,
        and _s_o_r_t your mail based on its spam attributes, as determined by the external
        filter. You also can display the spam attributes in your index display using
-       the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113) variable.
+       the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114) variable.
        (Tip: try %?H?[%H] ?  to display spam tags only when they are defined for a
        given message.)
 
        Your first step is to define your external filter's spam patterns using the
        spam command. _p_a_t_t_e_r_n should be a regular expression that matches a header in a
        mail message. If any message in the mailbox matches this regular expression, it
+
+       The Mutt Next Generation E-Mail Client                                       42
+
        will receive a ``spam tag'' or ``spam attribute'' (unless it also matches a
        nospam pattern -- see below.) The appearance of this attribute is entirely up
        to you, and is governed by the _f_o_r_m_a_t parameter. _f_o_r_m_a_t can be any static text,
@@ -2014,9 +2086,6 @@
        with the second, etc.
 
        If you're using multiple spam filters, a message can have more than one spam-
-
-       The Mutt Next Generation E-Mail Client                                       41
-
        related header. You can define spam patterns for each filter you use. If a mes-
        sage matches two or more of these patterns, and the $spam_separator variable is
        set to a string, then the message's spam tag will consist of all the _f_o_r_m_a_t
@@ -2061,6 +2130,9 @@
        still do something useful.
 
        The nospam command can be used to write exceptions to spam patterns. If a
+
+       The Mutt Next Generation E-Mail Client                                       43
+
        header pattern matches something in a spam command, but you nonetheless do not
        want it to receive a spam tag, you can list a more precise pattern under a
        nospam command.
@@ -2070,9 +2142,6 @@
        instead of adding an exception.  Likewise, if the _p_a_t_t_e_r_n for a spam command
        matches an entry on the nospam list, that nospam entry will be removed. If the
        _p_a_t_t_e_r_n for nospam is ``*'', _a_l_l _e_n_t_r_i_e_s _o_n _b_o_t_h _l_i_s_t_s will be removed. This
-
-       The Mutt Next Generation E-Mail Client                                       42
-
        might be the default action if you use spam and nospam in conjunction with a
        folder-hook.
 
@@ -2082,7 +2151,7 @@
 
             spam "^From: .*MAILER-DAEMON"       "999"
 
-       _3_._2_7  _S_e_t_t_i_n_g _v_a_r_i_a_b_l_e_s
+       _3_._2_8  _S_e_t_t_i_n_g _v_a_r_i_a_b_l_e_s
 
        Usage: set [no|inv]_v_a_r_i_a_b_l_e[=_v_a_l_u_e] [ _v_a_r_i_a_b_l_e ... ]
 
@@ -2093,7 +2162,7 @@
        Usage: reset _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
 
        This command is used to set (and unset) _c_o_n_f_i_g_u_r_a_t_i_o_n _v_a_r_i_a_b_l_e_s (section 7.4  ,
-       page 85).  There are four basic types of variables: boolean, number, string and
+       page 86).  There are four basic types of variables: boolean, number, string and
        quadoption.  _b_o_o_l_e_a_n variables can be _s_e_t (true) or _u_n_s_e_t (false).  _n_u_m_b_e_r
        variables can be assigned a positive integer value.
 
@@ -2114,6 +2183,8 @@
        toggle the value (on or off).  This is useful when writing macros.  Example:
        set invsmart_wrap.
 
+       The Mutt Next Generation E-Mail Client                                       44
+
        The toggle command automatically prepends the inv prefix to all specified vari-
        ables.
 
@@ -2123,8 +2194,6 @@
        Using the enter-command function in the _i_n_d_e_x menu, you can query the value of
        a variable by prefixing the name of the variable with a question mark:
 
-       The Mutt Next Generation E-Mail Client                                       43
-
             set ?allow_8bit
 
        The question mark is actually only required for boolean and quadoption vari-
@@ -2137,7 +2206,7 @@
        With the reset command there exists the special variable ``all'', which allows
        you to reset all variables to their system defaults.
 
-       _3_._2_8  _R_e_a_d_i_n_g _i_n_i_t_i_a_l_i_z_a_t_i_o_n _c_o_m_m_a_n_d_s _f_r_o_m _a_n_o_t_h_e_r _f_i_l_e
+       _3_._2_9  _R_e_a_d_i_n_g _i_n_i_t_i_a_l_i_z_a_t_i_o_n _c_o_m_m_a_n_d_s _f_r_o_m _a_n_o_t_h_e_r _f_i_l_e
 
        Usage: source _f_i_l_e_n_a_m_e [ _f_i_l_e_n_a_m_e ... ]
 
@@ -2151,7 +2220,7 @@
        If the filename ends with a vertical bar (|), then _f_i_l_e_n_a_m_e is considered to be
        an executable program from which to read input (eg.  source ~/bin/myscript|).
 
-       _3_._2_9  _R_e_m_o_v_i_n_g _h_o_o_k_s
+       _3_._3_0  _R_e_m_o_v_i_n_g _h_o_o_k_s
 
        Usage: unhook [ * | _h_o_o_k_-_t_y_p_e ]
 
@@ -2160,9 +2229,11 @@
        can remove all hooks of a specific type by saying something like unhook send-
        hook.
 
-       _3_._3_0  _S_h_a_r_i_n_g _S_e_t_u_p_s
+       _3_._3_1  _S_h_a_r_i_n_g _S_e_t_u_p_s
 
-       _3_._3_0_._1  _C_h_a_r_a_c_t_e_r _S_e_t_s
+       The Mutt Next Generation E-Mail Client                                       45
+
+       _3_._3_1_._1  _C_h_a_r_a_c_t_e_r _S_e_t_s
 
        As users may run mutt-ng on different systems, the configuration must be main-
        tained because it's likely that people want to use the setup everywhere they
@@ -2172,9 +2243,6 @@
        specify in which character set their configuration files are encoded. Please
        note that while reading the configuration files, this is only respected after
        the corresponding declaration appears. It's advised to put the following at the
-
-       The Mutt Next Generation E-Mail Client                                       44
-
        very beginning of a users muttngrc:
 
             set config_charset = "..."
@@ -2187,7 +2255,7 @@
        while, again, replacing the dots with the appropriate name. This tells vim as
        which character set to read and save the file.
 
-       _3_._3_0_._2  _M_o_d_u_l_a_r_i_z_a_t_i_o_n
+       _3_._3_1_._2  _M_o_d_u_l_a_r_i_z_a_t_i_o_n
 
        ``Modularization'' means to divide the setup into several files while sorting
        the options or commands by topic. Especially for longer setups (e.g. with many
@@ -2196,7 +2264,7 @@
        When using separation, setups may be, as a whole or in fractions, shared over
        different systems.
 
-       _3_._3_0_._3  _C_o_n_d_i_t_i_o_n_a_l _p_a_r_t_s
+       _3_._3_1_._3  _C_o_n_d_i_t_i_o_n_a_l _p_a_r_t_s
 
        When using a configuration on different systems, the user may not always have
        influence on how mutt-ng is installed and which features it includes.
@@ -2209,6 +2277,8 @@
 
        ...whereby <item> can be one of:
 
+       The Mutt Next Generation E-Mail Client                                       46
+
           +o a function name
 
           +o a variable name
@@ -2219,9 +2289,6 @@
 
        All available functions, variables and menus are documented elsewhere in this
        manual but ``features'' is specific to these two commands. To test for one,
-
-       The Mutt Next Generation E-Mail Client                                       45
-
        prefix one of the following keywords with feature_:
 
             ncurses, slang, iconv, idn, dotlock, standalone, pop, nntp, imap, ssl,
@@ -2240,13 +2307,13 @@
 
        An example for testing for variable names can be used if users use different
        revisions of mutt-ng whereby the older one may not have a certain variable. To
-       test for the availability of _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.102  , page 110),
+       test for the availability of _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.103  , page 111),
        use:
 
             ifdef imap_mail_check 'set imap_mail_check = 300'
 
        Provided for completeness is the test for menu names. To set _$_p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
-       (section 7.4.173  , page 129) only if the pager menu is available, use:
+       (section 7.4.174  , page 130) only if the pager menu is available, use:
 
             ifdef pager 'set pager_index_lines = 10'
 
@@ -2257,25 +2324,25 @@
             ifdef feature_ncurses 'source ~/.mutt-ng/setup-ncurses'
             ifndef feature_ncurses 'source ~/.mutt-ng/setup-slang'
 
+       The Mutt Next Generation E-Mail Client                                       47
+
        ...and...
 
             ifdef feature_slang 'source ~/.mutt-ng/setup-slang'
             ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'
 
-       The Mutt Next Generation E-Mail Client                                       46
-
-       _3_._3_1  _O_b_s_o_l_e_t_e _V_a_r_i_a_b_l_e_s
+       _3_._3_2  _O_b_s_o_l_e_t_e _V_a_r_i_a_b_l_e_s
 
        In the process of ensuring and creating more consistency, many variables have
        been renamed and some of the old names were already removed. Please see _O_b_s_o_-
-       _l_e_t_e _V_a_r_i_a_b_l_e_s (section 7.4  , page 85) for a complete list.
+       _l_e_t_e _V_a_r_i_a_b_l_e_s (section 7.4  , page 86) for a complete list.
 
        _4_.  _A_d_v_a_n_c_e_d _U_s_a_g_e
 
        _4_._1  _R_e_g_u_l_a_r _E_x_p_r_e_s_s_i_o_n_s
 
        All string patterns in Mutt-ng including those in more complex _p_a_t_t_e_r_n_s (sec-
-       tion 7.2  , page 81) must be specified using regular expressions (regexp) in
+       tion 7.2  , page 82) must be specified using regular expressions (regexp) in
        the ``POSIX extended'' syntax (which is more or less the syntax used by egrep
        and GNU awk).  For your convenience, we have included below a brief description
        of this syntax.
@@ -2303,6 +2370,8 @@
        sign ``$'' are metacharacters that respectively match the empty string at the
        beginning and end of a line.
 
+       The Mutt Next Generation E-Mail Client                                       48
+
        A list of characters enclosed by ``['' and ``]'' matches any single character
        in that list; if the first character of the list is a caret ``^'' then it
        matches any character nnoott in the list.  For example, the regular expression
@@ -2313,8 +2382,6 @@
        place it anywhere but first.  Finally, to include a literal hyphen ``-'' place
        it last.
 
-       The Mutt Next Generation E-Mail Client                                       47
-
        Certain named classes of characters are predefined.  Character classes consist
        of ``[:'', a keyword denoting the class, and ``:]''.  The following classes are
        defined by the POSIX standard:
@@ -2359,6 +2426,9 @@
 
        A character class is only valid in a regular expression inside the brackets of
        a character list.  Note that the brackets in these class names are part of the
+
+       The Mutt Next Generation E-Mail Client                                       49
+
        symbolic names, and must be included in addition to the brackets delimiting the
        bracket list.  For example, [[[[::ddiiggiitt::]]]] is equivalent to [[00--99]].
 
@@ -2369,9 +2439,6 @@
 
              Collating Symbols
                    A collating symbol is a multi-character collating element enclosed
-
-       The Mutt Next Generation E-Mail Client                                       48
-
                    in ``[.'' and ``.]''.  For example, if ``ch'' is a collating ele-
                    ment, then [[[[..cchh..]]]] is a regexp that matches this collating ele-
                    ment, while [[cchh]] is a regexp that matches either ``c'' or ``h''.
@@ -2416,6 +2483,9 @@
        ing regular expression matches any string matching either subexpression.
 
        Repetition takes precedence over concatenation, which in turn takes precedence
+
+       The Mutt Next Generation E-Mail Client                                       50
+
        over alternation.  A whole subexpression may be enclosed in parentheses to
        override these precedence rules.
 
@@ -2426,8 +2496,6 @@
                    Matches the empty string at either the beginning or the end of a
                    word.
 
-       The Mutt Next Generation E-Mail Client                                       49
-
              \\B
                    Matches the empty string within a word.
 
@@ -2459,7 +2527,7 @@
        to match messages, e.g. for operations like tagging and scoring. A pattern con-
        sists of one or more sub-pattern, which can be logically grouped, ORed, and
        negated. For a complete listing of these patterns, please refer to table _P_a_t_-
-       _t_e_r_n_s (section 7.2  , page 81) in the Reference chapter.
+       _t_e_r_n_s (section 7.2  , page 82) in the Reference chapter.
 
        It must be noted that in this table, EXPR, USER, ID and SUBJECT are regular
        expressions. For ranges, the forms <[MAX], >>[MIN], [MIN]- and -[MAX] are also
@@ -2471,6 +2539,8 @@
        most simple possibility is to logically AND several patterns by stringing them
        together:
 
+       The Mutt Next Generation E-Mail Client                                       51
+
             ~s 'SPAM' ~U
 
        The pattern above matches all messages that contain ``SPAM'' in the subject and
@@ -2479,8 +2549,6 @@
        To logical OR patterns, simply use the | operator. This one especially useful
        when using local groups:
 
-       The Mutt Next Generation E-Mail Client                                       50
-
             ~f ("nion@muttng\.org"|"ak@muttng\.org"|"pdmef@muttng\.org")
             (~b mutt-ng|~s Mutt-ng)
             !~x '@synflood\.at'
@@ -2520,6 +2588,8 @@
        date ranges between a fixed number of units and the current date. How this
        works can be seen in the following example:
 
+       The Mutt Next Generation E-Mail Client                                       52
+
             ~d >2w # messages older than two weeks
             ~d <3d # messages newer than 3 days
             ~d =1m # messages that are exactly one month old
@@ -2528,8 +2598,6 @@
 
        _4_._3_._1  _I_n_t_r_o_d_u_c_t_i_o_n
 
-       The Mutt Next Generation E-Mail Client                                       51
-
        The so called _F_o_r_m_a_t _S_t_r_i_n_g_s offer great flexibility when configuring mutt-ng.
        In short, they describe what items to print out how in menus and status mes-
        sages.
@@ -2546,7 +2614,7 @@
           +o the current mutt-ng version number
 
        The setting for the status bar of the index is controlled via the _$_s_t_a_t_u_s___f_o_r_-
-       _m_a_t (section 7.4.312  , page 162) variable. For the hostname and version
+       _m_a_t (section 7.4.313  , page 163) variable. For the hostname and version
        string, there's an expando for $status_format: %h expands to the hostname and
        %v to the version string. When just configuring:
 
@@ -2568,6 +2636,8 @@
 
        To include the mailbox' name is as easy as:
 
+       The Mutt Next Generation E-Mail Client                                       53
+
             set status_format = "%v on %h: %B: ...
 
        When the currently opened mailbox is Inbox, this will be expanded to:
@@ -2576,9 +2646,6 @@
 
        For the number of certain types of messages, one more feature of the format
        strings is extremely useful. If there aren't messages of a certain type, it may
-
-       The Mutt Next Generation E-Mail Client                                       52
-
        not be desired to print just that there aren't any but instead only print some-
        thing if there are any.
 
@@ -2614,6 +2681,8 @@
 
           +o  and make it print ``no new messages'' if there aren't any
 
+       The Mutt Next Generation E-Mail Client                                       54
+
        The corresponding configuration is:
 
             set status_format = "%v on %h: %B: %?n?%n new messages&no new messages? ...
@@ -2623,8 +2692,6 @@
 
             set status_format = "%v on %h: %B: %?n?%n&no? new messages ...
 
-       The Mutt Next Generation E-Mail Client                                       53
-
        As you might see from this rather simple example, one can create very complex
        but fancy status messages. Please see the reference chapter for expandos and
        those which may be printed nonzero.
@@ -2661,6 +2728,8 @@
 
                         set status_format = "%B: %?n?%n&no? new messages %> (%v on %h)"
 
+       The Mutt Next Generation E-Mail Client                                       55
+
        _4_._4  _U_s_i_n_g _T_a_g_s
 
        Sometimes it is desirable to perform an operation on a group of messages all at
@@ -2669,20 +2738,17 @@
        ject.  To tag all messages matching a pattern, use the tag-pattern function,
        which is bound to ``shift-T'' by default.  Or you can select individual mes-
        sages by hand using the ``tag-message'' function, which is bound to ``t'' by
-
-       The Mutt Next Generation E-Mail Client                                       54
-
-       default.  See _p_a_t_t_e_r_n_s (section 7.2  , page 81) for Mutt-ng's pattern matching
+       default.  See _p_a_t_t_e_r_n_s (section 7.2  , page 82) for Mutt-ng's pattern matching
        syntax.
 
        Once you have tagged the desired messages, you can use the ``tag-prefix'' oper-
        ator, which is the ``;'' (semicolon) key by default.  When the ``tag-prefix''
        operator is used, the nneexxtt operation will be applied to all tagged messages if
-       that operation can be used in that manner.  If the _$_a_u_t_o___t_a_g (section 7.4.18  ,
-       page 91) variable is set, the next operation applies to the tagged messages
+       that operation can be used in that manner.  If the _$_a_u_t_o___t_a_g (section 7.4.19  ,
+       page 92) variable is set, the next operation applies to the tagged messages
        automatically, without requiring the ``tag-prefix''.
 
-       In _m_a_c_r_o_s (section 3.7  , page 27) or _p_u_s_h (section 3.23  , page 38) commands,
+       In _m_a_c_r_o_s (section 3.8  , page 28) or _p_u_s_h (section 3.24  , page 40) commands,
        you can use the ``tag-prefix-cond'' operator.  If there are no tagged messages,
        mutt will "eat" the rest of the macro to abort it's execution.  Mutt-ng will
        stop "eating" the macro when it encounters the ``end-cond'' operator;  after
@@ -2694,44 +2760,45 @@
        arbitrary commands before performing some operation.  For example, you may wish
        to tailor your configuration based upon which mailbox you are reading, or to
        whom you are sending mail.  In the Mutt-ng world, a _h_o_o_k consists of a _r_e_g_u_l_a_r
-       _e_x_p_r_e_s_s_i_o_n (section 4.1  , page 46) or _p_a_t_t_e_r_n (section 7.2  , page 81) along
+       _e_x_p_r_e_s_s_i_o_n (section 4.1  , page 47) or _p_a_t_t_e_r_n (section 7.2  , page 82) along
        with a configuration option/command.  See
 
-          +o _f_o_l_d_e_r_-_h_o_o_k (section 3.6  , page 26)
+          +o _f_o_l_d_e_r_-_h_o_o_k (section 3.7  , page 28)
 
-          +o _s_e_n_d_-_h_o_o_k (section 3.20  , page 37)
+          +o _s_e_n_d_-_h_o_o_k (section 3.21  , page 38)
 
-          +o _m_e_s_s_a_g_e_-_h_o_o_k (section 3.21  , page 38)
+          +o _m_e_s_s_a_g_e_-_h_o_o_k (section 3.22  , page 39)
 
-          +o _s_a_v_e_-_h_o_o_k (section 3.17  , page 36)
+          +o _s_a_v_e_-_h_o_o_k (section 3.18  , page 37)
 
-          +o _m_b_o_x_-_h_o_o_k (section 3.13  , page 34)
+          +o _m_b_o_x_-_h_o_o_k (section 3.14  , page 35)
 
-          +o _f_c_c_-_h_o_o_k (section 3.18  , page 36)
+          +o _f_c_c_-_h_o_o_k (section 3.19  , page 38)
 
-          +o _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.19  , page 37)
+          +o _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.20  , page 38)
 
        for specific details on each type of _h_o_o_k available.
 
        NNoottee:: if a hook changes configuration settings, these changes remain effective
        until the end of the current mutt session. As this is generally not desired, a
        default hook needs to be added before all other hooks to restore configuration
+
+       The Mutt Next Generation E-Mail Client                                       56
+
        defaults. Here is an example with send-hook and the my_hdr directive:
 
             send-hook . 'unmy_hdr From:'
             send-hook ~C'^b@b\.b$' my_hdr from: c@c.c
 
-       The Mutt Next Generation E-Mail Client                                       55
-
        _4_._5_._1  _M_e_s_s_a_g_e _M_a_t_c_h_i_n_g _i_n _H_o_o_k_s
 
        Hooks that act upon messages (send-hook, save-hook, fcc-hook, message-hook) are
        evaluated in a slightly different manner.  For the other types of hooks, a _r_e_g_-
-       _u_l_a_r _e_x_p_r_e_s_s_i_o_n (section 4.1  , page 46) is sufficient.  But in dealing with
+       _u_l_a_r _e_x_p_r_e_s_s_i_o_n (section 4.1  , page 47) is sufficient.  But in dealing with
        messages a finer grain of control is needed for matching since for different
        purposes you want to match different criteria.
 
-       Mutt-ng allows the use of the _s_e_a_r_c_h _p_a_t_t_e_r_n (section 7.2  , page 81) language
+       Mutt-ng allows the use of the _s_e_a_r_c_h _p_a_t_t_e_r_n (section 7.2  , page 82) language
        for matching messages in hook commands.  This works in exactly the same way as
        it would when _l_i_m_i_t_i_n_g or _s_e_a_r_c_h_i_n_g the mailbox, except that you are restricted
        to those operators which match information mutt extracts from the header of the
@@ -2748,8 +2815,8 @@
        searching language.  You can still specify a simple _r_e_g_u_l_a_r _e_x_p_r_e_s_s_i_o_n like the
        other hooks, in which case Mutt-ng will translate your pattern into the full
        language, using the translation specified by the _$_d_e_f_a_u_l_t___h_o_o_k (section
-       7.4.47  , page 97) variable.  The pattern is translated at the time the hook is
-       declared, so the value of _$_d_e_f_a_u_l_t___h_o_o_k (section 7.4.47  , page 97) that is in
+       7.4.48  , page 98) variable.  The pattern is translated at the time the hook is
+       declared, so the value of _$_d_e_f_a_u_l_t___h_o_o_k (section 7.4.48  , page 98) that is in
        effect at that time will be used.
 
        _4_._6  _U_s_i_n_g _t_h_e _s_i_d_e_b_a_r
@@ -2764,6 +2831,8 @@
 
        If you want to specify the mailboxes you can do so with:
 
+       The Mutt Next Generation E-Mail Client                                       57
+
             set mbox='=INBOX'
             mailboxes INBOX \
                       MBOX1 \
@@ -2772,8 +2841,6 @@
 
        You can also specify the colors for mailboxes with new mails by using:
 
-       The Mutt Next Generation E-Mail Client                                       56
-
             color sidebar_new red black
             color sidebar white black
 
@@ -2805,13 +2872,16 @@
 
        Mutt-ng supports connecting to external directory databases such as LDAP,
        ph/qi, bbdb, or NIS through a wrapper script which connects to mutt using a
-       simple interface.  Using the _$_q_u_e_r_y___c_o_m_m_a_n_d (section 7.4.225  , page 141) vari-
+       simple interface.  Using the _$_q_u_e_r_y___c_o_m_m_a_n_d (section 7.4.226  , page 142) vari-
        able, you specify the wrapper command to use.  For example:
 
             set query_command = "mutt_ldap_query.pl '%s'"
 
        The wrapper script should accept the query on the command-line.  It should
        return a one line message, then each matching response on a single line, each
+
+       The Mutt Next Generation E-Mail Client                                       58
+
        line containing a tab separated address then name then some other optional
        information.  On error, or if there are no matching addresses, return a non-
        zero exit code and a one line error message.
@@ -2821,9 +2891,6 @@
             Searching database ... 20 entries ... 3 matching:
             me@cs.hmc.edu           Michael Elkins  mutt dude
             blong@fiction.net       Brandon Long    mutt and more
-
-       The Mutt Next Generation E-Mail Client                                       57
-
             roessler@guug.de        Thomas Roessler mutt pgp
 
        There are two mechanisms for accessing the query function of mutt.  One is to
@@ -2847,7 +2914,7 @@
        Mutt-ng supports reading and writing of four different mailbox formats: mbox,
        MMDF, MH and Maildir.  The mailbox type is autodetected, so there is no need to
        use a flag for different mailbox types.  When creating new mailboxes, Mutt-ng
-       uses the default specified with the _$_m_b_o_x___t_y_p_e (section 7.4.129  , page 118)
+       uses the default specified with the _$_m_b_o_x___t_y_p_e (section 7.4.130  , page 119)
        variable.
 
        mmbbooxx.  This is the most widely used mailbox format for UNIX.  All messages are
@@ -2864,6 +2931,9 @@
        MMHH. A radical departure from _m_b_o_x and _M_M_D_F, a mailbox consists of a directory
        and each message is stored in a separate file.  The filename indicates the mes-
        sage number (however, this is may not correspond to the message number Mutt-ng
+
+       The Mutt Next Generation E-Mail Client                                       59
+
        displays). Deleted messages are renamed with a comma (,) prepended to the file-
        name. NNoottee:: Mutt detects this type of mailbox by looking for either
        .mh_sequences or .xmhcache (needed to distinguish normal directories from MH
@@ -2873,9 +2943,6 @@
        ment for sendmail).  Similar to _M_H, except that it adds three subdirectories of
        the mailbox: _t_m_p, _n_e_w and _c_u_r.  Filenames for the messages are chosen in such a
        way they are unique, even when two programs are writing the mailbox over NFS,
-
-       The Mutt Next Generation E-Mail Client                                       58
-
        which means that no file locking is needed.
 
        _4_._9  _M_a_i_l_b_o_x _S_h_o_r_t_c_u_t_s
@@ -2884,12 +2951,12 @@
        These shortcuts can be used anywhere you are prompted for a file or mailbox
        path.
 
-          +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 7.4.301  , page 159) (incoming)
+          +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 7.4.302  , page 160) (incoming)
             mailbox
 
-          +o > -- refers to your _$_m_b_o_x (section 7.4.128  , page 118) file
+          +o > -- refers to your _$_m_b_o_x (section 7.4.129  , page 119) file
 
-          +o < -- refers to your _$_r_e_c_o_r_d (section 7.4.234  , page 143) file
+          +o < -- refers to your _$_r_e_c_o_r_d (section 7.4.235  , page 144) file
 
           +o ^ -- refers to the current mailbox
 
@@ -2897,9 +2964,9 @@
 
           +o ~ -- refers to your home directory
 
-          +o = or + -- refers to your _$_f_o_l_d_e_r (section 7.4.67  , page 102) directory
+          +o = or + -- refers to your _$_f_o_l_d_e_r (section 7.4.68  , page 103) directory
 
-          +o @_a_l_i_a_s -- refers to the _d_e_f_a_u_l_t _s_a_v_e _f_o_l_d_e_r (section 3.17  , page 36) as
+          +o @_a_l_i_a_s -- refers to the _d_e_f_a_u_l_t _s_a_v_e _f_o_l_d_e_r (section 3.18  , page 37) as
             determined by the address of the alias
 
        _4_._1_0  _H_a_n_d_l_i_n_g _M_a_i_l_i_n_g _L_i_s_t_s
@@ -2909,14 +2976,17 @@
        you consider to be mailing lists (technically this does not have to be a mail-
        ing list, but that is what it is most often used for), and what lists you are
        subscribed to.  This is accomplished through the use of the _l_i_s_t_s _a_n_d _s_u_b_s_c_r_i_b_e
-       (section 3.12  , page 33) commands in your muttrc.
+       (section 3.13  , page 34) commands in your muttrc.
 
        Now that Mutt-ng knows what your mailing lists are, it can do several things,
        the first of which is the ability to show the name of a list through which you
        received a message (i.e., of a subscribed list) in the _i_n_d_e_x menu display.
        This is useful to distinguish between personal and list mail in the same mail-
-       box.  In the _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113) variable, the escape
+       box.  In the _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114) variable, the escape
        ``%L'' will return the string ``To <list>'' when ``list'' appears in the ``To''
+
+       The Mutt Next Generation E-Mail Client                                       60
+
        field, and ``Cc <list>'' when it appears in the ``Cc'' field (otherwise it
        returns the name of the author).
 
@@ -2926,14 +2996,11 @@
        person.  The ``list-reply'' function, which by default is bound to ``L'' in the
        _i_n_d_e_x menu and _p_a_g_e_r, helps reduce the clutter by only replying to the known
        mailing list addresses instead of all recipients (except as specified by Mail-
-
-       The Mutt Next Generation E-Mail Client                                       59
-
        Followup-To, see below).
 
        Mutt-ng also supports the Mail-Followup-To header.  When you send a message to
        a list of recipients which includes one or several subscribed mailing lists,
-       and if the _$_f_o_l_l_o_w_u_p___t_o (section 7.4.69  , page 103) option is set, mutt will
+       and if the _$_f_o_l_l_o_w_u_p___t_o (section 7.4.70  , page 104) option is set, mutt will
        generate a Mail-Followup-To header which contains all the recipients to whom
        you send this message, but not your address. This indicates that group-replies
        or list-replies (also known as ``followups'') to this message should only be
@@ -2943,7 +3010,7 @@
 
        Conversely, when group-replying or list-replying to a message which has a Mail-
        Followup-To header, mutt will respect this header if the _$_h_o_n_o_r___f_o_l_l_o_w_u_p___t_o
-       (section 7.4.91  , page 108) configuration variable is set.  Using list-reply
+       (section 7.4.92  , page 109) configuration variable is set.  Using list-reply
        will in this case also make sure that the reply goes to the mailing list, even
        if it's not specified in the list of recipients in the Mail-Followup-To.
 
@@ -2956,7 +3023,7 @@
        the message.  This can create problems when trying to reply directly to the
        author in private, since most mail clients will automatically reply to the
        address given in the ``Reply-To'' field.  Mutt-ng uses the _$_r_e_p_l_y___t_o (section
-       7.4.237  , page 144) variable to help decide which address to use.  If set to
+       7.4.238  , page 145) variable to help decide which address to use.  If set to
        _a_s_k_-_y_e_s or _a_s_k_-_n_o, you will be prompted as to whether or not you would like to
        use the address given in the ``Reply-To'' field, or reply directly to the
        address given in the ``From'' field.  When set to _y_e_s, the ``Reply-To'' field
@@ -2964,26 +3031,26 @@
 
        The ``X-Label:'' header field can be used to further identify mailing lists or
        list subject matter (or just to annotate messages individually).  The
-       _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113) variable's ``%y'' and ``%Y''
+       _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114) variable's ``%y'' and ``%Y''
        escapes can be used to expand ``X-Label:'' fields in the index, and Mutt-ng's
        pattern-matcher can match regular expressions to ``X-Label:'' fields with the
        ``~y'' selector.  ``X-Label:'' is not a standard message header field, but it
        can easily be inserted by procmail and other mail filtering agents.
 
-       Lastly, Mutt-ng has the ability to _s_o_r_t (section 7.4.295  , page 157) the mail-
+       Lastly, Mutt-ng has the ability to _s_o_r_t (section 7.4.296  , page 158) the mail-
        box into _t_h_r_e_a_d_s (section 2.5.3  , page 11).  A thread is a group of messages
        which all relate to the same subject.  This is usually organized into a tree-
-       like structure where a message and all of its replies are represented graphi-
-       cally.  If you've ever used a threaded news client, this is the same concept.
-       It makes dealing with large volume mailing lists easier because you can easily
-       delete uninteresting threads and quickly find topics of value.
+       like structure where a message and all of its replies are represented
 
-       _4_._1_1  _E_d_i_t_i_n_g _t_h_r_e_a_d_s
+       The Mutt Next Generation E-Mail Client                                       61
 
-       Mutt-ng has the ability to dynamically restructure threads that are broken
+       graphically.  If you've ever used a threaded news client, this is the same con-
+       cept.  It makes dealing with large volume mailing lists easier because you can
+       easily delete uninteresting threads and quickly find topics of value.
 
-       The Mutt Next Generation E-Mail Client                                       60
+       _4_._1_1  _E_d_i_t_i_n_g _t_h_r_e_a_d_s
 
+       Mutt-ng has the ability to dynamically restructure threads that are broken
        either by misconfigured software or bad behavior from some correspondents. This
        allows to clean your mailboxes formats) from these annoyances which make it
        hard to follow a discussion.
@@ -3024,18 +3091,18 @@
 
        To support this, there are two variables:
 
-          +o _$_d_s_n___n_o_t_i_f_y (section 7.4.54  , page 99) is used to request receipts for
+          +o _$_d_s_n___n_o_t_i_f_y (section 7.4.55  , page 100) is used to request receipts for
             different results (such as failed message, message delivered, etc.).
 
-          +o _$_d_s_n___r_e_t_u_r_n (section 7.4.55  , page 99) requests how much of your message
+       The Mutt Next Generation E-Mail Client                                       62
+
+          +o _$_d_s_n___r_e_t_u_r_n (section 7.4.56  , page 100) requests how much of your message
             should be returned with the receipt (headers or full message).
 
        Please see the reference chapter for possible values.
 
        _4_._1_3  _P_O_P_3 _S_u_p_p_o_r_t _(_O_P_T_I_O_N_A_L_)
 
-       The Mutt Next Generation E-Mail Client                                       61
-
        If Mutt-ng was compiled with POP3 support (by running the _c_o_n_f_i_g_u_r_e script with
        the _-_-_e_n_a_b_l_e_-_p_o_p flag), it has the ability to work with mailboxes located on a
        remote POP3 server and fetch mail for local browsing.
@@ -3051,7 +3118,7 @@
 
        Polling for new mail is more expensive over POP3 than locally. For this reason
        the frequency at which Mutt-ng will check for mail remotely can be controlled
-       by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 7.4.212  , page 138) variable, which defaults
+       by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 7.4.213  , page 140) variable, which defaults
        to every 60 seconds.
 
        If Mutt-ng was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script with
@@ -3061,8 +3128,8 @@
        name@]popserver[:port]/.
 
        Another way to access your POP3 mail is the _f_e_t_c_h_-_m_a_i_l function (default: G).
-       It allows to connect to _p_o_p___h_o_s_t (section 7.4.210  , page 138), fetch all your
-       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 7.4.301  , page 159).
+       It allows to connect to _p_o_p___h_o_s_t (section 7.4.211  , page 139), fetch all your
+       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 7.4.302  , page 160).
        After this point, Mutt-ng runs exactly as if the mail had always been local.
 
        NNoottee:: If you only need to fetch all messages to local mailbox you should con-
@@ -3079,6 +3146,9 @@
        INBOX is the special name for your spool mailbox on the IMAP server. If you
        want to access another mail folder at the IMAP server, you should use
        imap://imapserver/path/to/folder where path/to/folder is the path of the folder
+
+       The Mutt Next Generation E-Mail Client                                       63
+
        you want to access.
 
        You can select an alternative port by specifying it with the server, i.e.:
@@ -3088,9 +3158,6 @@
        name@imapserver[:port]/INBOX.
 
        If Mutt-ng was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script with
-
-       The Mutt Next Generation E-Mail Client                                       62
-
        the _-_-_w_i_t_h_-_s_s_l flag), connections to IMAP servers can be encrypted. This natu-
        rally requires that the server supports SSL encrypted connections. To access a
        folder with IMAP/SSL, you should use imaps://[user-
@@ -3105,12 +3172,12 @@
 
        When browsing folders on an IMAP server, you can toggle whether to look at only
        the folders you are subscribed to, or all folders with the _t_o_g_g_l_e_-_s_u_b_s_c_r_i_b_e_d
-       command.  See also the _$_i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d (section 7.4.100  , page 110)
+       command.  See also the _$_i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d (section 7.4.101  , page 111)
        variable.
 
        Polling for new mail on an IMAP server can cause noticeable delays. So, you'll
-       want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.102  , page 110) and
-       _$_t_i_m_e_o_u_t (section 7.4.325  , page 166) variables.
+       want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.103  , page 111) and
+       _$_t_i_m_e_o_u_t (section 7.4.326  , page 168) variables.
 
        Note that if you are using mbox as the mail store on UW servers prior to
        v12.250, the server has been reported to disconnect a client if another client
@@ -3136,6 +3203,8 @@
             respectively). You may also subscribe and unsubscribe to mailboxes (nor-
             mally these are bound to s and u, respectively).
 
+       The Mutt Next Generation E-Mail Client                                       64
+
        _4_._1_4_._2  _A_u_t_h_e_n_t_i_c_a_t_i_o_n
 
        Mutt-ng supports four authentication methods with IMAP servers: SASL, GSSAPI,
@@ -3145,8 +3214,6 @@
        which allows you to log in to a public IMAP server without having an account.
        To use ANONYMOUS, simply make your username blank or "anonymous".
 
-       The Mutt Next Generation E-Mail Client                                       63
-
        SASL is a special super-authenticator, which selects among several protocols
        (including GSSAPI, CRAM-MD5, ANONYMOUS, and DIGEST-MD5) the most secure method
        available on your host and the server. Using some of these methods (including
@@ -3160,15 +3227,15 @@
 
        There are a few variables which control authentication:
 
-          +o _$_i_m_a_p___u_s_e_r (section 7.4.108  , page 112) - controls the username under
+          +o _$_i_m_a_p___u_s_e_r (section 7.4.109  , page 113) - controls the username under
             which you request authentication on the IMAP server, for all authentica-
             tors. This is overridden by an explicit username in the mailbox path (i.e.
             by using a mailbox name of the form {user@host}).
 
-          +o _$_i_m_a_p___p_a_s_s (section 7.4.103  , page 111) - a password which you may pre-
+          +o _$_i_m_a_p___p_a_s_s (section 7.4.104  , page 112) - a password which you may pre-
             set, used by all authentication methods where a password is needed.
 
-          +o _$_i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s (section 7.4.94  , page 108) - a colon-delimited list
+          +o _$_i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s (section 7.4.95  , page 109) - a colon-delimited list
             of IMAP authentication methods to try, in the order you wish to try them.
             If specified, this overrides mutt's default (attempt everything, in the
             order listed above).
@@ -3181,7 +3248,7 @@
 
        The Default newsserver can be obtained from the $NNTPSERVER environment vari-
        able. Like other news readers, info about subscribed newsgroups is saved in a
-       file as specified by the _$_n_n_t_p___n_e_w_s_r_c (section 7.4.160  , page 126) variable.
+       file as specified by the _$_n_n_t_p___n_e_w_s_r_c (section 7.4.161  , page 127) variable.
        Article headers are cached and can be loaded from a file when a newsgroup is
        entered instead loading from newsserver; currently, this caching mechanism
        still is different from the header caching for maildir/IMAP.
@@ -3190,8 +3257,11 @@
 
        Especially for Usenet, people often ask for advanced filtering and scoring
        functionality. Of course, mutt-ng has scoring and allows a killfile, too. How
-       to use a killfile has been discussed in _M_e_s_s_a_g_e _s_c_o_r_i_n_g (section 3.25  , page
-       39).
+
+       The Mutt Next Generation E-Mail Client                                       65
+
+       to use a killfile has been discussed in _M_e_s_s_a_g_e _s_c_o_r_i_n_g (section 3.26  , page
+       40).
 
        What has not been discusses in detail is mutt-ng's built-in realname filter.
        For may newsreaders including those for ``advanced users'' like _s_l_r_n or _t_i_n,
@@ -3200,8 +3270,6 @@
 
        In mutt-ng this is as easy as
 
-       The Mutt Next Generation E-Mail Client                                       64
-
             score ~* =42
 
        This tells mutt-ng to apply a score of 42 to all messages whose sender speci-
@@ -3229,30 +3297,29 @@
        functionality. When configure was called with --with-libesmtp or the output
        muttng -v contains +USE_LIBESMTP, this will be or is the case already. The SMTP
        support includes support for Delivery Status Notification (see _D_e_l_i_v_e_r_y _S_t_a_t_u_s
-       _N_o_t_i_f_i_c_a_t_i_o_n (section 4.12  , page 60) section) as well as handling the 8BIT-
-       MIME flag controlled via _$_u_s_e___8_b_i_t_m_i_m_e (section 7.4.332  , page 168).
+       _N_o_t_i_f_i_c_a_t_i_o_n (section 4.12  , page 61) section) as well as handling the 8BIT-
+       MIME flag controlled via _$_u_s_e___8_b_i_t_m_i_m_e (section 7.4.333  , page 169).
 
        To enable sending mail directly via SMTP without an MTA such as Postfix or
-       SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 7.4.290  , page 156)
+       SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 7.4.291  , page 157)
        variable pointing to your SMTP server.
 
-       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 7.4.294  ,
-       page 157) and _$_s_m_t_p___p_a_s_s (section 7.4.291  , page 156) variables.
+       The Mutt Next Generation E-Mail Client                                       66
+
+       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 7.4.295  ,
+       page 158) and _$_s_m_t_p___p_a_s_s (section 7.4.292  , page 157) variables.
 
        Transport Encryption via the StartTLS command is also available. For this to
        work, first of all Mutt-ng must be built with SSL or GNUTLS.  Secondly, the
-       _$_s_m_t_p___u_s_e___t_l_s (section 7.4.293  , page 157) variable must be either set to
+       _$_s_m_t_p___u_s_e___t_l_s (section 7.4.294  , page 158) variable must be either set to
        ``enabled'' or ``required.'' In both cases, StartTLS will be used if the server
        supports it: for the second case, the connection will fail if it doesn't while
        switching back to unencrypted communication for the first one.
 
        Some mail providers require user's to set a particular envelope sender, i.e.
-
-       The Mutt Next Generation E-Mail Client                                       65
-
        they allow for only one value which may not be what the user wants to send as
-       the From: header. In this case, the variable _$_s_m_t_p___e_n_v_e_l_o_p_e (section 7.4.289  ,
-       page 156) may be used to set the envelope different from the From: header.
+       the From: header. In this case, the variable _$_s_m_t_p___e_n_v_e_l_o_p_e (section 7.4.290  ,
+       page 157) may be used to set the envelope different from the From: header.
 
        _4_._1_7  _M_a_n_a_g_i_n_g _m_u_l_t_i_p_l_e _I_M_A_P_/_P_O_P_/_N_N_T_P _a_c_c_o_u_n_t_s _(_O_P_T_I_O_N_A_L_)
 
@@ -3286,6 +3353,8 @@
        an arbitrary format, provided that the user has a script to convert from/to
        this format to one of the accepted.
 
+       The Mutt Next Generation E-Mail Client                                       67
+
        The most common use is to open compressed archived folders e.g. with gzip.
 
        In addition, the user can provide a script that gets a folder in an accepted
@@ -3293,13 +3362,11 @@
        may be faster than converting the entire folder to the accepted format, append-
        ing to it and converting back to the user-defined format.
 
-       There are three hooks defined (_o_p_e_n_-_h_o_o_k (section 4.19.1  , page 66), _c_l_o_s_e_-
-       _h_o_o_k (section 4.19.2  , page 66) and _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 67))
+       There are three hooks defined (_o_p_e_n_-_h_o_o_k (section 4.19.1  , page 67), _c_l_o_s_e_-
+       _h_o_o_k (section 4.19.2  , page 67) and _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 68))
        which define commands to uncompress and compress a folder and to append mes-
        sages to an existing compressed folder respectively.
 
-       The Mutt Next Generation E-Mail Client                                       66
-
        For example:
 
             open-hook \\.gz$ "gzip -cd %f > %t"
@@ -3307,17 +3374,17 @@
             append-hook \\.gz$ "gzip -c %t >> %f"
 
        You do not have to specify all of the commands. If you omit _a_p_p_e_n_d_-_h_o_o_k (sec-
-       tion 4.19.3  , page 67), the folder will be open and closed again each time you
-       will add to it. If you omit _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 66) (or give
+       tion 4.19.3  , page 68), the folder will be open and closed again each time you
+       will add to it. If you omit _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 67) (or give
        empty command) , the folder will be open in the  mode. If you specify _a_p_p_e_n_d_-
-       _h_o_o_k (section 4.19.3  , page 67) though you'll be able to append to the folder.
+       _h_o_o_k (section 4.19.3  , page 68) though you'll be able to append to the folder.
 
        Note that Mutt-ng will only try to use hooks if the file is not in one of the
        accepted formats. In particular, if the file is empty, mutt supposes it is not
        compressed. This is important because it allows the use of programs that do not
        have well defined extensions. Just use '.' as a regexp. But this may be sur-
        prising if your compressing script produces empty files. In this situation,
-       unset _$_s_a_v_e___e_m_p_t_y (section 7.4.244  , page 146), so that the compressed file
+       unset _$_s_a_v_e___e_m_p_t_y (section 7.4.245  , page 147), so that the compressed file
        will be removed if you delete all of the messages.
 
        _4_._1_9_._1  _O_p_e_n _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x _f_o_r _r_e_a_d_i_n_g
@@ -3340,6 +3407,8 @@
 
        Example:
 
+       The Mutt Next Generation E-Mail Client                                       68
+
             open-hook \\.gz$ "gzip -cd %f > %t"
 
        If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type.
@@ -3349,14 +3418,12 @@
        Usage: close-hook _r_e_g_e_x_p '_c_o_m_m_a_n_d'
 
        This is used to close the folder that was open with the _o_p_e_n_-_h_o_o_k (section
-       4.19.1  , page 66) command after some changes were made to it.
-
-       The Mutt Next Generation E-Mail Client                                       67
+       4.19.1  , page 67) command after some changes were made to it.
 
        The _c_o_m_m_a_n_d string is the command that can be used for closing the folders
        whose names match _r_e_g_e_x_p. It has the same format as in the _o_p_e_n_-_h_o_o_k (section
-       4.19.1  , page 66) command. Temporary folder in this case is the folder previ-
-       ously produced by the <_o_p_e_n_-_h_o_o_k (section 4.19.1  , page 66) command.
+       4.19.1  , page 67) command. Temporary folder in this case is the folder previ-
+       ously produced by the <_o_p_e_n_-_h_o_o_k (section 4.19.1  , page 67) command.
 
        The _c_o_m_m_a_n_d should nnoott remove the decompressed file. The _c_o_m_m_a_n_d should return
        non-zero exit status if it fails, so mutt knows something's wrong.
@@ -3368,7 +3435,7 @@
        If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type, and the
        file can only be open in the readonly mode.
 
-       _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 66) is not called when you exit from the
+       _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 67) is not called when you exit from the
        folder if the folder was not changed.
 
        _4_._1_9_._3  _A_p_p_e_n_d _a _m_e_s_s_a_g_e _t_o _a _c_o_m_p_r_e_s_s_e_d _m_a_i_l_b_o_x
@@ -3377,7 +3444,7 @@
 
        This command is used for saving to an existing compressed folder.  The _c_o_m_m_a_n_d
        is the command that can be used for appending to the folders whose names match
-       _r_e_g_e_x_p. It has the same format as in the _o_p_e_n_-_h_o_o_k (section 4.19.1  , page 66)
+       _r_e_g_e_x_p. It has the same format as in the _o_p_e_n_-_h_o_o_k (section 4.19.1  , page 67)
        command.  The temporary folder in this case contains the messages that are
        being appended.
 
@@ -3388,22 +3455,23 @@
 
             append-hook \\.gz$ "gzip -c %t >> %f"
 
-       When _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 67) is used, the folder is not opened,
+       When _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 68) is used, the folder is not opened,
        which saves time, but this means that we can not find out what the folder type
-       is. Thus the default (_$_m_b_o_x___t_y_p_e (section 7.4.129  , page 118)) type is always
+       is. Thus the default (_$_m_b_o_x___t_y_p_e (section 7.4.130  , page 119)) type is always
+
+       The Mutt Next Generation E-Mail Client                                       69
+
        supposed (i.e.  this is the format used for the temporary folder).
 
        If the file does not exist when you save to it, _c_l_o_s_e_-_h_o_o_k (section 4.19.2  ,
-       page 66) is called, and not _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 67). _a_p_p_e_n_d_-
-       _h_o_o_k (section 4.19.3  , page 67) is only for appending to existing folders.
+       page 67) is called, and not _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 68). _a_p_p_e_n_d_-
+       _h_o_o_k (section 4.19.3  , page 68) is only for appending to existing folders.
 
        If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type. In this
        case, the folder will be open and closed again (using _o_p_e_n_-_h_o_o_k (section
-       4.19.1  , page 66) and _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 66)respectively) each
+       4.19.1  , page 67) and _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 67)respectively) each
        time you will add to it.
 
-       The Mutt Next Generation E-Mail Client                                       68
-
        _4_._1_9_._4  _E_n_c_r_y_p_t_e_d _f_o_l_d_e_r_s
 
        The compressed folders support can also be used to handle encrypted folders. If
@@ -3440,6 +3508,9 @@
        the message to a text representation.  Mutt-ng internally supports a number of
        MIME types, including text/plain, text/enriched, message/rfc822, and mes-
        sage/news.  In addition, the export controlled version of Mutt-ng recognizes a
+
+       The Mutt Next Generation E-Mail Client                                       70
+
        variety of PGP MIME types, including PGP/MIME and application/pgp.
 
        Mutt-ng will denote attachments with a couple lines describing them.  These
@@ -3451,8 +3522,6 @@
        Where the Description is the description or filename given for the attachment,
        and the Encoding is one of 7bit/8bit/quoted-printable/base64/binary.
 
-       The Mutt Next Generation E-Mail Client                                       69
-
        If Mutt-ng cannot deal with a MIME type, it will display a message like:
 
             [-- image/gif is unsupported (use 'v' to view this part) --]
@@ -3493,6 +3562,9 @@
        or canceling) the message.  It can be toggled with the toggle-unlink command
        (default: u).  The next field is the MIME content-type, and can be changed with
        the edit-type command (default: ^T).  The next field is the encoding for the
+
+       The Mutt Next Generation E-Mail Client                                       71
+
        attachment, which allows a binary message to be encoded for transmission on
        7bit links.  It can be changed with the edit-encoding command (default: ^E).
        The next field is the size of the attachment, rounded to kilobytes or
@@ -3503,9 +3575,6 @@
        _5_._2  _M_I_M_E _T_y_p_e _c_o_n_f_i_g_u_r_a_t_i_o_n _w_i_t_h _m_i_m_e_._t_y_p_e_s
 
        When you add an attachment to your mail message, Mutt-ng searches your personal
-
-       The Mutt Next Generation E-Mail Client                                       70
-
        mime.types file at ${HOME}/.mime.types, and then the system mime.types file at
        /usr/local/share/mutt/mime.types or /etc/mime.types
 
@@ -3545,6 +3614,9 @@
 
        In order to handle various MIME types that Mutt-ng can not handle internally,
        Mutt-ng parses a series of external configuration files to find an external
+
+       The Mutt Next Generation E-Mail Client                                       72
+
        handler.  The default search string for these files is a colon delimited list
        set to
 
@@ -3555,8 +3627,6 @@
        In particular, the metamail distribution will install a mailcap file, usually
        as /usr/local/etc/mailcap, which contains some baseline entries.
 
-       The Mutt Next Generation E-Mail Client                                       71
-
        _5_._3_._1  _T_h_e _B_a_s_i_c_s _o_f _t_h_e _m_a_i_l_c_a_p _f_i_l_e
 
        A mailcap file consists of a series of lines which are comments, blank, or def-
@@ -3599,6 +3669,8 @@
 
             text/html; lynx %s
 
+       The Mutt Next Generation E-Mail Client                                       73
+
        In this case, lynx does not support viewing a file from stdin, so you must use
        the %s syntax.  NNoottee:: _S_o_m_e _o_l_d_e_r _v_e_r_s_i_o_n_s _o_f _l_y_n_x _c_o_n_t_a_i_n _a _b_u_g _w_h_e_r_e _t_h_e_y _w_i_l_l
        _c_h_e_c_k _t_h_e _m_a_i_l_c_a_p _f_i_l_e _f_o_r _a _v_i_e_w_e_r _f_o_r _t_e_x_t_/_h_t_m_l_.  _T_h_e_y _w_i_l_l _f_i_n_d _t_h_e _l_i_n_e
@@ -3608,8 +3680,6 @@
        On the other hand, maybe you don't want to use lynx interactively, you just
        want to have it convert the text/html to text/plain, then you can use:
 
-       The Mutt Next Generation E-Mail Client                                       72
-
             text/html; lynx -dump %s | more
 
        Perhaps you wish to use lynx to view text/html files, and a pager on all other
@@ -3625,7 +3695,7 @@
        The interpretation of shell meta-characters embedded in MIME parameters can
        lead to security problems in general.  Mutt-ng tries to quote parameters in
        expansion of %s syntaxes properly, and avoids risky characters by substituting
-       them, see the _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 7.4.120  , page 117) variable.
+       them, see the _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 7.4.121  , page 118) variable.
 
        Although mutt's procedures to invoke programs with mailcap seem to be safe,
        there are other applications parsing mailcap, maybe taking less care of it.
@@ -3651,6 +3721,8 @@
 
        _5_._3_._3_._1  _O_p_t_i_o_n_a_l _F_i_e_l_d_s
 
+       The Mutt Next Generation E-Mail Client                                       74
+
        In addition to the required content-type and view command fields, you can add
        semi-colon ';' separated fields to set flags and other options.  Mutt-ng recog-
        nizes the following optional fields:
@@ -3660,9 +3732,6 @@
                    amounts of text on stdout.  This causes Mutt-ng to invoke a pager
                    (either the internal pager or the external pager defined by the
                    pager variable) on the output of the view command.  Without this
-
-       The Mutt Next Generation E-Mail Client                                       73
-
                    flag, Mutt-ng assumes that the command is interactive.  One could
                    use this to replace the pipe to more in the lynx -dump example in
                    the Basic section:
@@ -3674,11 +3743,11 @@
 
              needsterminal
                    Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w (sec-
-                   tion 5.4  , page 76), in order to decide whether it should honor
-                   the setting of the _$_w_a_i_t___k_e_y (section 7.4.339  , page 169) variable
+                   tion 5.4  , page 77), in order to decide whether it should honor
+                   the setting of the _$_w_a_i_t___k_e_y (section 7.4.339  , page 170) variable
                    or not.  When an attachment is viewed using an interactive program,
                    and the corresponding mailcap entry has a _n_e_e_d_s_t_e_r_m_i_n_a_l flag, Mutt-
-                   ng will use _$_w_a_i_t___k_e_y (section 7.4.339  , page 169) and the exit
+                   ng will use _$_w_a_i_t___k_e_y (section 7.4.339  , page 170) and the exit
                    status of the program to decide if it will ask you to press a key
                    after the external program has exited.  In all other situations it
                    will not prompt you for a key.
@@ -3706,6 +3775,8 @@
                    it to compose new attachments.  Mutt-ng will default to the defined
                    editor for text attachments.
 
+       The Mutt Next Generation E-Mail Client                                       75
+
              nametemplate=<template>
                    This field specifies the format for the file denoted by %s in the
                    command fields.  Certain programs will require a certain file
@@ -3716,8 +3787,6 @@
 
                         text/html; lynx %s; nametemplate=%s.html
 
-       The Mutt Next Generation E-Mail Client                                       74
-
              test=<command>
                    This field specifies a command to run to test whether this mailcap
                    entry should be used.  The command is defined with the command
@@ -3751,7 +3820,7 @@
        Mutt-ng will skip the image/* entry and use the image/gif entry with the print
        command.
 
-       In addition, you can use this with _A_u_t_o_v_i_e_w (section 5.4  , page 76) to denote
+       In addition, you can use this with _A_u_t_o_v_i_e_w (section 5.4  , page 77) to denote
        two commands for viewing an attachment, one to be viewed automatically, the
        other to be viewed interactively from the attachment menu.  In addition, you
        can then use the test feature to determine which viewer to use interactively
@@ -3759,9 +3828,12 @@
 
             text/html;      netscape -remote 'openURL(%s)' ; test=RunningX
             text/html;      lynx %s; nametemplate=%s.html
+
+       The Mutt Next Generation E-Mail Client                                       76
+
             text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput
 
-       For _A_u_t_o_v_i_e_w (section 5.4  , page 76), Mutt-ng will choose the third entry
+       For _A_u_t_o_v_i_e_w (section 5.4  , page 77), Mutt-ng will choose the third entry
        because of the copiousoutput tag.  For interactive viewing, Mutt will run the
        program RunningX to determine if it should use the first entry.  If the program
        returns non-zero, Mutt-ng will use the second entry for interactive viewing.
@@ -3769,9 +3841,6 @@
        _5_._3_._3_._3  _C_o_m_m_a_n_d _E_x_p_a_n_s_i_o_n
 
        The various commands defined in the mailcap files are passed to the /bin/sh
-
-       The Mutt Next Generation E-Mail Client                                       75
-
        shell using the system() function.  Before the command is passed to /bin/sh -c,
        it is parsed to expand various special parameters with information from Mutt-
        ng.  The keywords Mutt-ng expands are:
@@ -3811,6 +3880,8 @@
 
        This mailcap file is fairly simple and standard:
 
+       The Mutt Next Generation E-Mail Client                                       77
+
             # I'm always running X :)
             video/*;        xanim %s > /dev/null
             image/*;        xv %s > /dev/null
@@ -3820,8 +3891,6 @@
 
        This mailcap file shows quite a number of examples:
 
-       The Mutt Next Generation E-Mail Client                                       76
-
             # Use xanim to view all videos   Xanim produces a header on startup,
             # send that to /dev/null so I don't see it
             video/*;        xanim %s > /dev/null
@@ -3861,8 +3930,11 @@
        _5_._4  _M_I_M_E _A_u_t_o_v_i_e_w
 
        In addition to explicitly telling Mutt-ng to view an attachment with the MIME
-       viewer defined in the mailcap file, Mutt-ng has support for automatically view-
-       ing MIME attachments while in the pager.
+       viewer defined in the mailcap file, Mutt-ng has support for automatically
+
+       The Mutt Next Generation E-Mail Client                                       78
+
+       viewing MIME attachments while in the pager.
 
        To work, you must define a viewer in the mailcap file which uses the copi-
        ousoutput option to denote that it is non-interactive.  Usually, you also use
@@ -3874,8 +3946,6 @@
 
        For instance, if you set auto_view to:
 
-       The Mutt Next Generation E-Mail Client                                       77
-
             auto_view text/html application/x-gunzip application/postscript image/gif application/x-tar-gz
 
        Mutt-ng could use the following mailcap entries to automatically view attach-
@@ -3902,7 +3972,7 @@
             alternative_order text/enriched text/plain text application/postscript image/*
 
        Next, mutt will check if any of the types have a defined _a_u_t_o___v_i_e_w (section
-       5.4  , page 76), and use that.  Failing that, Mutt-ng will look for any text
+       5.4  , page 77), and use that.  Failing that, Mutt-ng will look for any text
        type.  As a last attempt, mutt will look for any type it knows how to handle.
 
        To remove a MIME type from the alternative_order list, use the unalterna-
@@ -3911,6 +3981,9 @@
        _5_._6  _M_I_M_E _L_o_o_k_u_p
 
        Mutt-ng's mime_lookup list specifies a list of mime-types that should not be
+
+       The Mutt Next Generation E-Mail Client                                       79
+
        treated according to their mailcap entry.  This option is designed to deal with
        binary types such as application/octet-stream.  When an attachment's mime-type
        is listed in mime_lookup, then the extension of the filename will be compared
@@ -3922,9 +3995,6 @@
             mime_lookup application/octet-stream application/X-Lotus-Manuscript
 
        In addition, the unmime_lookup command may be used to disable this feature for
-
-       The Mutt Next Generation E-Mail Client                                       78
-
        any particular mime-type if it had been set, for example, in a global muttrc.
 
        _6_.  _S_e_c_u_r_i_t_y _C_o_n_s_i_d_e_r_a_t_i_o_n_s
@@ -3955,12 +4025,14 @@
        _6_._2  _T_e_m_p_o_r_a_r_y _F_i_l_e_s
 
        Mutt-ng uses many temporary files for viewing messages, verifying digital sig-
-       natures, etc. The _$_u_m_a_s_k (section 7.4.330  , page 168) variable can be used to
+       natures, etc. The _$_u_m_a_s_k (section 7.4.331  , page 169) variable can be used to
        change the default permissions of these files. Please only change it if you
        really know what you are doing.  Also, a different location for these files may
-       be desired which can be changed via the _$_t_m_p_d_i_r (section 7.4.326  , page 167)
+       be desired which can be changed via the _$_t_m_p_d_i_r (section 7.4.327  , page 168)
        variable.
 
+       The Mutt Next Generation E-Mail Client                                       80
+
        _6_._3  _I_n_f_o_r_m_a_t_i_o_n _L_e_a_k_s
 
        _6_._3_._1  _M_e_s_s_a_g_e_-_I_D_: _h_e_a_d_e_r_s
@@ -3970,11 +4042,9 @@
        step counter which is increased (and rotated) with every message sent. If you'd
        like to hide this information probably telling others how many mail you sent in
        which time, you at least need to remove the %P expando from the default setting
-       of the _$_m_s_g_i_d___f_o_r_m_a_t (section 7.4.146  , page 122) variable. Please make sure
+       of the _$_m_s_g_i_d___f_o_r_m_a_t (section 7.4.147  , page 123) variable. Please make sure
        that you really know how local parts of these Message-ID: headers are composed.
 
-       The Mutt Next Generation E-Mail Client                                       79
-
        _6_._3_._2  _m_a_i_l_t_o_:_-_s_t_y_l_e _l_i_n_k_s
 
        As mutt-ng be can be set up to be the mail client to handle mailto: style links
@@ -3982,7 +4052,7 @@
        default, mutt-ng will be strict in interpreting them which means that arbitrary
        header fields can be embedded in these links which could override existing
        header fields or attach arbitrary files. This may be problematic if the
-       _$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100) variable is _u_n_s_e_t, i.e. the user
+       _$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101) variable is _u_n_s_e_t, i.e. the user
        doesn't want to see header fields while editing the message.
 
        For example, following a link like
@@ -3992,13 +4062,13 @@
        will send out the user's private gnupg keyring to joe@host if the user doesn't
        follow the information on screen carefully enough.
 
-       When _u_n_s_e_t_t_i_n_g the _$_s_t_r_i_c_t___m_a_i_l_t_o (section 7.4.314  , page 164) variable, mutt-
+       When _u_n_s_e_t_t_i_n_g the _$_s_t_r_i_c_t___m_a_i_l_t_o (section 7.4.315  , page 165) variable, mutt-
        ng will
 
           +o be less strict when interpreting these links by prepending a X-Mailto-
             string to all header fields embedded in such a link _a_n_d
 
-          +o turn on the _$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100) variable by force
+          +o turn on the _$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101) variable by force
             to let the user see all the headers (because they still may leak informa-
             tion.)
 
@@ -4011,26 +4081,27 @@
 
        One of these is the mailcap mechanism as defined by RfC 1524. Mutt-ng can be
        set up to _a_u_t_o_m_a_t_i_c_a_l_l_y execute any given utility as listed in one of the mail-
-       cap files (see the _$_m_a_i_l_c_a_p___p_a_t_h (section 7.4.119  , page 116) variable for
+       cap files (see the _$_m_a_i_l_c_a_p___p_a_t_h (section 7.4.120  , page 117) variable for
        details.)
 
-       These utilities may have a variety of security vulnerabilities, including over-
-       writing of arbitrary files, information leaks or other exploitable bugs.  These
-       vulnerabilities may go unnoticed by the user, especially when they are called
-       automatically (and without interactive prompting) from the mailcap file(s).
-       When using mutt-ng's autoview mechanism in combination with mailcap files,
-       please be sure to...
+       These utilities may have a variety of security vulnerabilities, including
+
+       The Mutt Next Generation E-Mail Client                                       81
+
+       overwriting of arbitrary files, information leaks or other exploitable bugs.
+       These vulnerabilities may go unnoticed by the user, especially when they are
+       called automatically (and without interactive prompting) from the mailcap
+       file(s). When using mutt-ng's autoview mechanism in combination with mailcap
+       files, please be sure to...
 
           +o manually select trustworth applications with a reasonable calling sequence
 
           +o periodically check the contents of mailcap files, especially after soft-
             ware installations or upgrades
 
-       The Mutt Next Generation E-Mail Client                                       80
-
           +o keep the software packages referenced in the mailcap file up to date
 
-          +o leave the _$_m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 7.4.120  , page 117) variable in its
+          +o leave the _$_m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 7.4.121  , page 118) variable in its
             default state to restrict mailcap expandos to a safe set of characters
 
        _6_._4_._2  _O_t_h_e_r
@@ -4054,11 +4125,12 @@
        mailbox.  However, it is possible to read other mailboxes and to send messages
        from the command line as well.
 
+       The Mutt Next Generation E-Mail Client                                       82
+
             -A      expand an alias
             -a      attach a file to a message
             -b      specify a blind carbon-copy (BCC) address
             -c      specify a carbon-copy (Cc) address
-            -D      print the value of all variables on stdout
             -e      specify a config command to be run after initialization files are read
             -f      specify a mailbox to load
             -F      specify an alternate file to read initialization commands
@@ -4071,6 +4143,8 @@
             -Q      query a configuration variable
             -R      open mailbox in read-only mode
             -s      specify a subject (enclose in quotes if it contains spaces)
+            -t      dump the value of all variables to stdout
+            -T      dump the value of all changed variables to stdout
             -v      show version number and compile-time definitions
             -x      simulate the mailx(1) compose mode
             -y      show a menu containing the files specified by the mailboxes command
@@ -4079,8 +4153,6 @@
 
        To read messages in a mailbox
 
-       The Mutt Next Generation E-Mail Client                                       81
-
        mutt [ -nz ] [ -F _m_u_t_t_r_c ] [ -m _t_y_p_e ] [ -f _m_a_i_l_b_o_x ]
 
        To compose a new message
@@ -4099,7 +4171,7 @@
 
        _7_._2  _P_a_t_t_e_r_n_s
 
-       The Mutt Next Generation E-Mail Client                                       82
+       The Mutt Next Generation E-Mail Client                                       83
 
             ~A              all messages
             ~b EXPR         messages which contain EXPR in the message body
@@ -4148,13 +4220,13 @@
                             alternates or any alias)
 
        Where EXPR, USER, ID, and SUBJECT are _r_e_g_u_l_a_r _e_x_p_r_e_s_s_i_o_n_s (section 4.1  , page
-       46).  Special attention has to be made when using regular expressions inside of
+       47).  Special attention has to be made when using regular expressions inside of
        patterns.  Specifically, Mutt-ng's parser for these patterns will strip one
        level of backslash (\), which is normally used for quoting.  If it is your
        intention to use a backslash in the regular expression, you will need to use
        two backslashes instead (\\).
 
-       The Mutt Next Generation E-Mail Client                                       83
+       The Mutt Next Generation E-Mail Client                                       84
 
        *) The forms <[MAX], >[MIN], [MIN]- and -[MAX] are allowed, too.
 
@@ -4162,117 +4234,117 @@
 
        The following are the commands understood by mutt.
 
-          +o _a_c_c_o_u_n_t_-_h_o_o_k (section 4.17  , page 64) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
+          +o _a_c_c_o_u_n_t_-_h_o_o_k (section 4.17  , page 65) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
 
-          +o _a_l_i_a_s (section 3.3  , page 23) _k_e_y _a_d_d_r_e_s_s [ , _a_d_d_r_e_s_s, ... ]
+          +o _a_l_i_a_s (section 3.4  , page 24) _k_e_y _a_d_d_r_e_s_s [ , _a_d_d_r_e_s_s, ... ]
 
-          +o _u_n_a_l_i_a_s (section 3.3  , page 23) [ * | _k_e_y ... ]
+          +o _u_n_a_l_i_a_s (section 3.4  , page 24) [ * | _k_e_y ... ]
 
-          +o _a_l_t_e_r_n_a_t_e_s (section 3.10  , page 31) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
+          +o _a_l_t_e_r_n_a_t_e_s (section 3.11  , page 32) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
-          +o _u_n_a_l_t_e_r_n_a_t_e_s (section 3.10  , page 31) [ * | _r_e_g_e_x_p ... ]
+          +o _u_n_a_l_t_e_r_n_a_t_e_s (section 3.11  , page 32) [ * | _r_e_g_e_x_p ... ]
 
-          +o _a_l_t_e_r_n_a_t_i_v_e___o_r_d_e_r (section 5.5  , page 77) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
+          +o _a_l_t_e_r_n_a_t_i_v_e___o_r_d_e_r (section 5.5  , page 78) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
 
-          +o _u_n_a_l_t_e_r_n_a_t_i_v_e___o_r_d_e_r (section 5.5  , page 77) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
+          +o _u_n_a_l_t_e_r_n_a_t_i_v_e___o_r_d_e_r (section 5.5  , page 78) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
 
-          +o _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 67) _r_e_g_e_x_p _c_o_m_m_a_n_d
+          +o _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 68) _r_e_g_e_x_p _c_o_m_m_a_n_d
 
-          +o _a_u_t_o___v_i_e_w (section 5.4  , page 76) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
+          +o _a_u_t_o___v_i_e_w (section 5.4  , page 77) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
 
-          +o _u_n_a_u_t_o___v_i_e_w (section 5.4  , page 76) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
+          +o _u_n_a_u_t_o___v_i_e_w (section 5.4  , page 77) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
 
-          +o _b_i_n_d (section 3.4  , page 24) _m_a_p _k_e_y _f_u_n_c_t_i_o_n
+          +o _b_i_n_d (section 3.5  , page 25) _m_a_p _k_e_y _f_u_n_c_t_i_o_n
 
-          +o _c_h_a_r_s_e_t_-_h_o_o_k (section 3.5  , page 26) _a_l_i_a_s _c_h_a_r_s_e_t
+          +o _c_h_a_r_s_e_t_-_h_o_o_k (section 3.6  , page 27) _a_l_i_a_s _c_h_a_r_s_e_t
 
-          +o _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 66) _r_e_g_e_x_p _c_o_m_m_a_n_d
+          +o _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 67) _r_e_g_e_x_p _c_o_m_m_a_n_d
 
-          +o _c_o_l_o_r (section 3.8  , page 28) _o_b_j_e_c_t _f_o_r_e_g_r_o_u_n_d _b_a_c_k_g_r_o_u_n_d [ _r_e_g_e_x_p ]
+          +o _c_o_l_o_r (section 3.9  , page 29) _o_b_j_e_c_t _f_o_r_e_g_r_o_u_n_d _b_a_c_k_g_r_o_u_n_d [ _r_e_g_e_x_p ]
 
-          +o _u_n_c_o_l_o_r (section 3.8  , page 28) _i_n_d_e_x _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
+          +o _u_n_c_o_l_o_r (section 3.9  , page 29) _i_n_d_e_x _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
-          +o _e_x_e_c (section 3.24  , page 39) _f_u_n_c_t_i_o_n [ _f_u_n_c_t_i_o_n ... ]
+          +o _e_x_e_c (section 3.25  , page 40) _f_u_n_c_t_i_o_n [ _f_u_n_c_t_i_o_n ... ]
 
-          +o _f_c_c_-_h_o_o_k (section 3.18  , page 36) _p_a_t_t_e_r_n _m_a_i_l_b_o_x
+          +o _f_c_c_-_h_o_o_k (section 3.19  , page 38) _p_a_t_t_e_r_n _m_a_i_l_b_o_x
 
-          +o _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.19  , page 37) _p_a_t_t_e_r_n _m_a_i_l_b_o_x
+          +o _f_c_c_-_s_a_v_e_-_h_o_o_k (section 3.20  , page 38) _p_a_t_t_e_r_n _m_a_i_l_b_o_x
 
-          +o _f_o_l_d_e_r_-_h_o_o_k (section 3.6  , page 26) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
+          +o _f_o_l_d_e_r_-_h_o_o_k (section 3.7  , page 28) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
 
-          +o _h_d_r___o_r_d_e_r (section 3.16  , page 36) _h_e_a_d_e_r [ _h_e_a_d_e_r ... ]
+          +o _h_d_r___o_r_d_e_r (section 3.17  , page 37) _h_e_a_d_e_r [ _h_e_a_d_e_r ... ]
 
-          +o _u_n_h_d_r___o_r_d_e_r (section 3.16  , page 36) _h_e_a_d_e_r [ _h_e_a_d_e_r ... ]
+          +o _u_n_h_d_r___o_r_d_e_r (section 3.17  , page 37) _h_e_a_d_e_r [ _h_e_a_d_e_r ... ]
 
-          +o _i_c_o_n_v_-_h_o_o_k (section 3.5  , page 26) _c_h_a_r_s_e_t _l_o_c_a_l_-_c_h_a_r_s_e_t
+          +o _i_c_o_n_v_-_h_o_o_k (section 3.6  , page 27) _c_h_a_r_s_e_t _l_o_c_a_l_-_c_h_a_r_s_e_t
 
-          +o _i_g_n_o_r_e (section 3.9  , page 30) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
+          +o _i_g_n_o_r_e (section 3.10  , page 31) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
-       The Mutt Next Generation E-Mail Client                                       84
+       The Mutt Next Generation E-Mail Client                                       85
 
-          +o _u_n_i_g_n_o_r_e (section 3.9  , page 30) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
+          +o _u_n_i_g_n_o_r_e (section 3.10  , page 31) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
-          +o _l_i_s_t_s (section 3.12  , page 33) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
+          +o _l_i_s_t_s (section 3.13  , page 34) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
-          +o _u_n_l_i_s_t_s (section 3.12  , page 33) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
+          +o _u_n_l_i_s_t_s (section 3.13  , page 34) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
-          +o _m_a_c_r_o (section 3.7  , page 27) _m_e_n_u _k_e_y _s_e_q_u_e_n_c_e [ _d_e_s_c_r_i_p_t_i_o_n ]
+          +o _m_a_c_r_o (section 3.8  , page 28) _m_e_n_u _k_e_y _s_e_q_u_e_n_c_e [ _d_e_s_c_r_i_p_t_i_o_n ]
 
-          +o _m_a_i_l_b_o_x_e_s (section 3.14  , page 34) _f_i_l_e_n_a_m_e [ _f_i_l_e_n_a_m_e ... ]
+          +o _m_a_i_l_b_o_x_e_s (section 3.15  , page 36) _f_i_l_e_n_a_m_e [ _f_i_l_e_n_a_m_e ... ]
 
-          +o _m_b_o_x_-_h_o_o_k (section 3.13  , page 34) _p_a_t_t_e_r_n _m_a_i_l_b_o_x
+          +o _m_b_o_x_-_h_o_o_k (section 3.14  , page 35) _p_a_t_t_e_r_n _m_a_i_l_b_o_x
 
-          +o _m_e_s_s_a_g_e_-_h_o_o_k (section 3.21  , page 38) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
+          +o _m_e_s_s_a_g_e_-_h_o_o_k (section 3.22  , page 39) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
 
-          +o _m_i_m_e___l_o_o_k_u_p (section 5.6  , page 77) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
+          +o _m_i_m_e___l_o_o_k_u_p (section 5.6  , page 78) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
 
-          +o _u_n_m_i_m_e___l_o_o_k_u_p (section 5.6  , page 77) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
+          +o _u_n_m_i_m_e___l_o_o_k_u_p (section 5.6  , page 78) _m_i_m_e_t_y_p_e [ _m_i_m_e_t_y_p_e ... ]
 
-          +o _m_o_n_o (section 3.8  , page 28) _o_b_j_e_c_t _a_t_t_r_i_b_u_t_e [ _r_e_g_e_x_p ]
+          +o _m_o_n_o (section 3.9  , page 29) _o_b_j_e_c_t _a_t_t_r_i_b_u_t_e [ _r_e_g_e_x_p ]
 
-          +o _u_n_m_o_n_o (section 3.8  , page 28) _i_n_d_e_x _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
+          +o _u_n_m_o_n_o (section 3.9  , page 29) _i_n_d_e_x _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
-          +o _m_y___h_d_r (section 3.15  , page 35) _s_t_r_i_n_g
+          +o _m_y___h_d_r (section 3.16  , page 36) _s_t_r_i_n_g
 
-          +o _u_n_m_y___h_d_r (section 3.15  , page 35) _f_i_e_l_d [ _f_i_e_l_d ... ]
+          +o _u_n_m_y___h_d_r (section 3.16  , page 36) _f_i_e_l_d [ _f_i_e_l_d ... ]
 
-          +o _o_p_e_n_-_h_o_o_k (section 4.19.1  , page 66) _r_e_g_e_x_p _c_o_m_m_a_n_d
+          +o _o_p_e_n_-_h_o_o_k (section 4.19.1  , page 67) _r_e_g_e_x_p _c_o_m_m_a_n_d
 
-          +o _c_r_y_p_t_-_h_o_o_k (section 3.22  , page 38) _p_a_t_t_e_r_n _k_e_y_-_i_d
+          +o _c_r_y_p_t_-_h_o_o_k (section 3.23  , page 39) _p_a_t_t_e_r_n _k_e_y_-_i_d
 
-          +o _p_u_s_h (section 3.23  , page 38) _s_t_r_i_n_g
+          +o _p_u_s_h (section 3.24  , page 40) _s_t_r_i_n_g
 
-          +o _r_e_s_e_t (section 3.27  , page 42) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
+          +o _r_e_s_e_t (section 3.28  , page 43) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
 
-          +o _s_a_v_e_-_h_o_o_k (section 3.17  , page 36) _r_e_g_e_x_p _f_i_l_e_n_a_m_e
+          +o _s_a_v_e_-_h_o_o_k (section 3.18  , page 37) _r_e_g_e_x_p _f_i_l_e_n_a_m_e
 
-          +o _s_c_o_r_e (section 3.25  , page 39) _p_a_t_t_e_r_n _v_a_l_u_e
+          +o _s_c_o_r_e (section 3.26  , page 40) _p_a_t_t_e_r_n _v_a_l_u_e
 
-          +o _u_n_s_c_o_r_e (section 3.25  , page 39) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
+          +o _u_n_s_c_o_r_e (section 3.26  , page 40) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
-          +o _s_e_n_d_-_h_o_o_k (section 3.20  , page 37) _r_e_g_e_x_p _c_o_m_m_a_n_d
+          +o _s_e_n_d_-_h_o_o_k (section 3.21  , page 38) _r_e_g_e_x_p _c_o_m_m_a_n_d
 
           +o _r_e_p_l_y_-_h_o_o_k (section , page ) _r_e_g_e_x_p _c_o_m_m_a_n_d
 
-          +o _s_e_t (section 3.27  , page 42) [no|inv]_v_a_r_i_a_b_l_e[=_v_a_l_u_e] [ _v_a_r_i_a_b_l_e ... ]
+          +o _s_e_t (section 3.28  , page 43) [no|inv]_v_a_r_i_a_b_l_e[=_v_a_l_u_e] [ _v_a_r_i_a_b_l_e ... ]
 
-          +o _u_n_s_e_t (section 3.27  , page 42) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
+          +o _u_n_s_e_t (section 3.28  , page 43) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
 
-          +o _s_o_u_r_c_e (section 3.28  , page 43) _f_i_l_e_n_a_m_e
+          +o _s_o_u_r_c_e (section 3.29  , page 44) _f_i_l_e_n_a_m_e
 
-          +o _s_p_a_m (section 3.26  , page 40) _p_a_t_t_e_r_n _f_o_r_m_a_t
+          +o _s_p_a_m (section 3.27  , page 41) _p_a_t_t_e_r_n _f_o_r_m_a_t
 
-          +o _n_o_s_p_a_m (section 3.26  , page 40) _p_a_t_t_e_r_n
+          +o _n_o_s_p_a_m (section 3.27  , page 41) _p_a_t_t_e_r_n
 
-       The Mutt Next Generation E-Mail Client                                       85
+       The Mutt Next Generation E-Mail Client                                       86
 
-          +o _s_u_b_s_c_r_i_b_e (section 3.12  , page 33) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
+          +o _s_u_b_s_c_r_i_b_e (section 3.13  , page 34) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
-          +o _u_n_s_u_b_s_c_r_i_b_e (section 3.12  , page 33) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
+          +o _u_n_s_u_b_s_c_r_i_b_e (section 3.13  , page 34) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
-          +o _t_o_g_g_l_e (section 3.27  , page 42) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
+          +o _t_o_g_g_l_e (section 3.28  , page 43) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
 
-          +o _u_n_h_o_o_k (section 3.29  , page 43) _h_o_o_k_-_t_y_p_e
+          +o _u_n_h_o_o_k (section 3.30  , page 44) _h_o_o_k_-_t_y_p_e
 
        _7_._4  _C_o_n_f_i_g_u_r_a_t_i_o_n _v_a_r_i_a_b_l_e_s
 
@@ -4281,7 +4353,7 @@
        left column contains the old synonym variables, the right column the full/new
        name:
 
-       The Mutt Next Generation E-Mail Client                                       86
+       The Mutt Next Generation E-Mail Client                                       87
 
             edit_hdrs               edit_headers
             forw_decode             forward_decode
@@ -4337,17 +4409,18 @@
 
        This variable specifies whether to abort sending if no attachment was made but
 
-       The Mutt Next Generation E-Mail Client                                       87
+       The Mutt Next Generation E-Mail Client                                       88
 
        the content references them, i.e. the content matches the regular expression
-       given in $attach_remind_regexp. If a match was found and this variable is set
-       to _y_e_s, message sending will be aborted but the mail will be send nevertheless
-       if set to _n_o.
+       given in _$_a_t_t_a_c_h___r_e_m_i_n_d___r_e_g_e_x_p (section 7.4.15  , page 91). If a match was
+       found and this variable is set to _y_e_s, message sending will be aborted but the
+       mail will be send nevertheless if set to _n_o.
 
-       This variable and $attach_remind_regexp are intended to remind the user to
-       attach files if the message's text references them.
+       This variable and _$_a_t_t_a_c_h___r_e_m_i_n_d___r_e_g_e_x_p (section 7.4.15  , page 91) are
+       intended to remind the user to attach files if the message's text references
+       them.
 
-       See also the $attach_remind_regexp variable.
+       See also the _$_a_t_t_a_c_h___r_e_m_i_n_d___r_e_g_e_x_p (section 7.4.15  , page 91) variable.
 
        _7_._4_._2  _a_b_o_r_t___n_o_s_u_b_j_e_c_t
 
@@ -4369,7 +4442,16 @@
        body if no changes are made to the file (this check only happens after the
        _f_i_r_s_t edit of the file).  When set to _n_o, composition will never be aborted.
 
-       _7_._4_._4  _a_l_i_a_s___f_i_l_e
+       _7_._4_._4  _a_g_e_n_t___s_t_r_i_n_g
+
+       Type: boolean
+
+       Default: yes
+
+       When _s_e_t, Mutt-ng will add a ``User-Agent:'' header to outgoing messages, indi-
+       cating which version of Mutt-ng was used for composing them.
+
+       _7_._4_._5  _a_l_i_a_s___f_i_l_e
 
        Type: path
 
@@ -4379,9 +4461,11 @@
        tion 2.5.4  , page 11)'' function.
 
        NNoottee:: Mutt-ng will not automatically source this file; you must explicitly use
-       the ``_s_o_u_r_c_e (section 3.28  , page 43)'' command for it to be executed.
+       the ``_s_o_u_r_c_e (section 3.29  , page 44)'' command for it to be executed.
+
+       _7_._4_._6  _a_l_i_a_s___f_o_r_m_a_t
 
-       _7_._4_._5  _a_l_i_a_s___f_o_r_m_a_t
+       The Mutt Next Generation E-Mail Client                                       89
 
        Type: string
 
@@ -4393,8 +4477,6 @@
              %a
                    alias name
 
-       The Mutt Next Generation E-Mail Client                                       88
-
              %f
                    flags - currently, a 'd' for an alias marked for deletion
 
@@ -4407,7 +4489,7 @@
              %t
                    character which indicates if the alias is tagged for inclusion
 
-       _7_._4_._6  _a_l_l_o_w___8_b_i_t
+       _7_._4_._7  _a_l_l_o_w___8_b_i_t
 
        Type: boolean
 
@@ -4416,7 +4498,7 @@
        Controls whether 8-bit data is converted to 7-bit using either quoted-printable
        or base64 encoding when sending mail.
 
-       _7_._4_._7  _a_l_l_o_w___a_n_s_i
+       _7_._4_._8  _a_l_l_o_w___a_n_s_i
 
        Type: boolean
 
@@ -4429,7 +4511,7 @@
        sage could include a line like ``[-- PGP output follows ...' and give it the
        same color as your attachment color.
 
-       _7_._4_._8  _a_r_r_o_w___c_u_r_s_o_r
+       _7_._4_._9  _a_r_r_o_w___c_u_r_s_o_r
 
        Type: boolean
 
@@ -4440,7 +4522,9 @@
        will make response faster because there is less that has to be redrawn on the
        screen when moving to the next or previous entries in the menu.
 
-       _7_._4_._9  _a_s_c_i_i___c_h_a_r_s
+       The Mutt Next Generation E-Mail Client                                       90
+
+       _7_._4_._1_0  _a_s_c_i_i___c_h_a_r_s
 
        Type: boolean
 
@@ -4449,9 +4533,7 @@
        If _s_e_t, Mutt-ng will use plain ASCII characters when displaying thread and
        attachment trees, instead of the default ACS characters.
 
-       The Mutt Next Generation E-Mail Client                                       89
-
-       _7_._4_._1_0  _a_s_k_b_c_c
+       _7_._4_._1_1  _a_s_k_b_c_c
 
        Type: boolean
 
@@ -4460,7 +4542,7 @@
        If _s_e_t, Mutt-ng will prompt you for blind-carbon-copy (Bcc) recipients before
        editing an outgoing message.
 
-       _7_._4_._1_1  _a_s_k_c_c
+       _7_._4_._1_2  _a_s_k_c_c
 
        Type: boolean
 
@@ -4469,7 +4551,7 @@
        If _s_e_t, Mutt-ng will prompt you for carbon-copy (Cc) recipients before editing
        the body of an outgoing message.
 
-       _7_._4_._1_2  _a_s_s_u_m_e_d___c_h_a_r_s_e_t
+       _7_._4_._1_3  _a_s_s_u_m_e_d___c_h_a_r_s_e_t
 
        Type: string
 
@@ -4486,9 +4568,9 @@
        set assumed_charset='iso-2022-jp:euc-jp:shift_jis:utf-8'
 
        However, only the first content is valid for the message body.  This variable
-       is valid only if _$_s_t_r_i_c_t___m_i_m_e (section 7.4.315  , page 164) is unset.
+       is valid only if _$_s_t_r_i_c_t___m_i_m_e (section 7.4.316  , page 166) is unset.
 
-       _7_._4_._1_3  _a_t_t_a_c_h___f_o_r_m_a_t
+       _7_._4_._1_4  _a_t_t_a_c_h___f_o_r_m_a_t
 
        Type: string
 
@@ -4497,6 +4579,8 @@
        This variable describes the format of the ``attachment'' menu.  The following
        printf(3)-style sequences are understood:
 
+       The Mutt Next Generation E-Mail Client                                       91
+
              %C
                    charset
 
@@ -4506,8 +4590,6 @@
              %D
                    deleted flag
 
-       The Mutt Next Generation E-Mail Client                                       90
-
              %d
                    description
 
@@ -4547,22 +4629,22 @@
              %|X
                    pad to the end of the line with character 'X'
 
-       _7_._4_._1_4  _a_t_t_a_c_h___r_e_m_i_n_d___r_e_g_e_x_p
+       _7_._4_._1_5  _a_t_t_a_c_h___r_e_m_i_n_d___r_e_g_e_x_p
 
        Type: regular expression
 
        Default: 'attach'
 
+       The Mutt Next Generation E-Mail Client                                       92
+
        If this variable is non-empty, muttng will scan a message's contents before
        sending for this regular expression. If it is found, it will ask for what to do
-       depending on the setting of $abort_noattach.
-
-       This variable and $abort_noattach are intended to remind the user to attach
-       files if the message's text references them.
+       depending on the setting of _$_a_b_o_r_t___n_o_a_t_t_a_c_h (section 7.4.1  , page 87).
 
-       _7_._4_._1_5  _a_t_t_a_c_h___s_e_p
+       This variable and _$_a_b_o_r_t___n_o_a_t_t_a_c_h (section 7.4.1  , page 87) are intended to
+       remind the user to attach files if the message's text references them.
 
-       The Mutt Next Generation E-Mail Client                                       91
+       _7_._4_._1_6  _a_t_t_a_c_h___s_e_p
 
        Type: string
 
@@ -4571,7 +4653,7 @@
        The separator to add between attachments when operating (saving, printing, pip-
        ing, etc) on a list of tagged attachments.
 
-       _7_._4_._1_6  _a_t_t_a_c_h___s_p_l_i_t
+       _7_._4_._1_7  _a_t_t_a_c_h___s_p_l_i_t
 
        Type: boolean
 
@@ -4579,11 +4661,11 @@
 
        If this variable is _u_n_s_e_t, when operating (saving, printing, piping, etc) on a
        list of tagged attachments, Mutt-ng will concatenate the attachments and will
-       operate on them as a single attachment. The ``_$_a_t_t_a_c_h___s_e_p (section 7.4.15  ,
-       page 91)'' separator is added after each attachment. When _s_e_t, Mutt-ng will
+       operate on them as a single attachment. The ``_$_a_t_t_a_c_h___s_e_p (section 7.4.16  ,
+       page 92)'' separator is added after each attachment. When _s_e_t, Mutt-ng will
        operate on the attachments one by one.
 
-       _7_._4_._1_7  _a_t_t_r_i_b_u_t_i_o_n
+       _7_._4_._1_8  _a_t_t_r_i_b_u_t_i_o_n
 
        Type: string
 
@@ -4591,9 +4673,9 @@
 
        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 ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113)''.
+       on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114)''.
 
-       _7_._4_._1_8  _a_u_t_o___t_a_g
+       _7_._4_._1_9  _a_u_t_o___t_a_g
 
        Type: boolean
 
@@ -4604,22 +4686,22 @@
        ``tag-prefix'' function (default: ';') to make the next function apply to all
        tagged messages.
 
-       _7_._4_._1_9  _a_u_t_o_e_d_i_t
+       _7_._4_._2_0  _a_u_t_o_e_d_i_t
 
        Type: boolean
 
        Default: no
 
-       When _s_e_t along with ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100)'', Mutt-ng
+       The Mutt Next Generation E-Mail Client                                       93
+
+       When _s_e_t along with ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101)'', Mutt-ng
        will skip the initial send-menu and allow you to immediately begin editing the
        body of your message.  The send-menu may still be accessed once you have fin-
        ished editing the body of your message.
 
-       Also see ``_$_f_a_s_t___r_e_p_l_y (section 7.4.63  , page 101)''.
+       Also see ``_$_f_a_s_t___r_e_p_l_y (section 7.4.64  , page 102)''.
 
-       The Mutt Next Generation E-Mail Client                                       92
-
-       _7_._4_._2_0  _b_e_e_p
+       _7_._4_._2_1  _b_e_e_p
 
        Type: boolean
 
@@ -4627,7 +4709,7 @@
 
        When this variable is _s_e_t, Mutt-ng will beep when an error occurs.
 
-       _7_._4_._2_1  _b_e_e_p___n_e_w
+       _7_._4_._2_2  _b_e_e_p___n_e_w
 
        Type: boolean
 
@@ -4635,9 +4717,9 @@
 
        When this variable is _s_e_t, Mutt-ng will beep whenever it prints a message noti-
        fying you of new mail.  This is independent of the setting of the ``_$_b_e_e_p (sec-
-       tion 7.4.20  , page 92)'' variable.
+       tion 7.4.21  , page 93)'' variable.
 
-       _7_._4_._2_2  _b_o_u_n_c_e
+       _7_._4_._2_3  _b_o_u_n_c_e
 
        Type: quadoption
 
@@ -4648,7 +4730,7 @@
        _n_o is not generally useful, and thus not recommended, because you are unable to
        bounce messages.
 
-       _7_._4_._2_3  _b_o_u_n_c_e___d_e_l_i_v_e_r_e_d
+       _7_._4_._2_4  _b_o_u_n_c_e___d_e_l_i_v_e_r_e_d
 
        Type: boolean
 
@@ -4657,7 +4739,7 @@
        When this variable is _s_e_t, Mutt-ng will include Delivered-To: header fields
        when bouncing messages.  Postfix users may wish to _u_n_s_e_t this variable.
 
-       _7_._4_._2_4  _b_r_a_i_l_l_e___f_r_i_e_n_d_l_y
+       _7_._4_._2_5  _b_r_a_i_l_l_e___f_r_i_e_n_d_l_y
 
        Type: boolean
 
@@ -4666,15 +4748,16 @@
        When this variable is set, mutt will place the cursor at the beginning of the
        current line in menus, even when the arrow_cursor variable is unset, making it
        easier for blind persons using Braille displays to follow these menus.  The
+
+       The Mutt Next Generation E-Mail Client                                       94
+
        option is disabled by default because many visual terminals don't permit making
        the cursor invisible.
 
-       _7_._4_._2_5  _c_e_r_t_i_f_i_c_a_t_e___f_i_l_e
+       _7_._4_._2_6  _c_e_r_t_i_f_i_c_a_t_e___f_i_l_e
 
        Type: path
 
-       The Mutt Next Generation E-Mail Client                                       93
-
        Default: '~/.mutt_certificates'
 
        Availability: SSL or GNUTLS
@@ -4690,7 +4773,7 @@
 
        Example: set certificate_file=~/.muttng/certificates
 
-       _7_._4_._2_6  _c_h_a_r_s_e_t
+       _7_._4_._2_7  _c_h_a_r_s_e_t
 
        Type: string
 
@@ -4698,7 +4781,7 @@
 
        Character set your terminal uses to display and enter textual data.
 
-       _7_._4_._2_7  _c_h_e_c_k___n_e_w
+       _7_._4_._2_8  _c_h_e_c_k___n_e_w
 
        Type: boolean
 
@@ -4712,7 +4795,7 @@
        been looked at.  If it's _u_n_s_e_t, no check for new mail is performed while the
        mailbox is open.
 
-       _7_._4_._2_8  _c_o_l_l_a_p_s_e___u_n_r_e_a_d
+       _7_._4_._2_9  _c_o_l_l_a_p_s_e___u_n_r_e_a_d
 
        Type: boolean
 
@@ -4721,17 +4804,16 @@
        When _u_n_s_e_t, Mutt-ng will not collapse a thread if it contains any unread mes-
        sages.
 
-       _7_._4_._2_9  _c_o_m_p_o_s_e___f_o_r_m_a_t
+       The Mutt Next Generation E-Mail Client                                       95
+
+       _7_._4_._3_0  _c_o_m_p_o_s_e___f_o_r_m_a_t
 
        Type: string
 
        Default: '-- Mutt-ng: Compose  [Approx. msg size: %l   Atts: %a]%>-'
 
        Controls the format of the status line displayed in the ``compose'' menu.  This
-       string is similar to ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.312  , page 162)'', but has
-
-       The Mutt Next Generation E-Mail Client                                       94
-
+       string is similar to ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.313  , page 163)'', but has
        its own set of printf(3)-like sequences:
 
              %a
@@ -4746,11 +4828,11 @@
              %v
                    Mutt-ng version string
 
-       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.312  , page 162)''
-       option for more information on how to set ``_$_c_o_m_p_o_s_e___f_o_r_m_a_t (section 7.4.29  ,
-       page 93)''.
+       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.313  , page 163)''
+       option for more information on how to set ``_$_c_o_m_p_o_s_e___f_o_r_m_a_t (section 7.4.30  ,
+       page 95)''.
 
-       _7_._4_._3_0  _c_o_n_f_i_g___c_h_a_r_s_e_t
+       _7_._4_._3_1  _c_o_n_f_i_g___c_h_a_r_s_e_t
 
        Type: string
 
@@ -4758,7 +4840,7 @@
 
        When defined, Mutt-ng will recode commands in rc files from this encoding.
 
-       _7_._4_._3_1  _c_o_n_f_i_r_m_a_p_p_e_n_d
+       _7_._4_._3_2  _c_o_n_f_i_r_m_a_p_p_e_n_d
 
        Type: boolean
 
@@ -4767,7 +4849,7 @@
        When _s_e_t, Mutt-ng will prompt for confirmation when appending messages to an
        existing mailbox.
 
-       _7_._4_._3_2  _c_o_n_f_i_r_m_c_r_e_a_t_e
+       _7_._4_._3_3  _c_o_n_f_i_r_m_c_r_e_a_t_e
 
        Type: boolean
 
@@ -4776,7 +4858,9 @@
        When _s_e_t, Mutt-ng will prompt for confirmation when saving messages to a mail-
        box which does not yet exist before creating it.
 
-       _7_._4_._3_3  _c_o_n_n_e_c_t___t_i_m_e_o_u_t
+       _7_._4_._3_4  _c_o_n_n_e_c_t___t_i_m_e_o_u_t
+
+       The Mutt Next Generation E-Mail Client                                       96
 
        Type: number
 
@@ -4786,9 +4870,7 @@
        many seconds if the connection is not able to be established.  A negative value
        causes Mutt-ng to wait indefinitely for the connection to succeed.
 
-       The Mutt Next Generation E-Mail Client                                       95
-
-       _7_._4_._3_4  _c_o_n_t_e_n_t___t_y_p_e
+       _7_._4_._3_5  _c_o_n_t_e_n_t___t_y_p_e
 
        Type: string
 
@@ -4797,18 +4879,18 @@
        Sets the default Content-Type: header field for the body of newly composed mes-
        sages.
 
-       _7_._4_._3_5  _c_o_p_y
+       _7_._4_._3_6  _c_o_p_y
 
        Type: quadoption
 
        Default: yes
 
        This variable controls whether or not copies of your outgoing messages will be
-       saved for later references.  Also see ``_$_r_e_c_o_r_d (section 7.4.234  , page
-       143)'', ``_$_s_a_v_e___n_a_m_e (section 7.4.245  , page 146)'', ``_$_f_o_r_c_e___n_a_m_e (section
-       7.4.71  , page 103)'' and ``_f_c_c_-_h_o_o_k (section 3.18  , page 36)''.
+       saved for later references.  Also see ``_$_r_e_c_o_r_d (section 7.4.235  , page
+       144)'', ``_$_s_a_v_e___n_a_m_e (section 7.4.246  , page 147)'', ``_$_f_o_r_c_e___n_a_m_e (section
+       7.4.72  , page 105)'' and ``_f_c_c_-_h_o_o_k (section 3.19  , page 38)''.
 
-       _7_._4_._3_6  _c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t
+       _7_._4_._3_7  _c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t
 
        Type: boolean
 
@@ -4818,11 +4900,11 @@
        going messages.  This is probably only useful in connection to the _s_e_n_d_-_h_o_o_k
        command.  It can be overridden by use of the _p_g_p_-_m_e_n_u, when encryption is not
        required or signing is requested as well.  If ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section
-       7.4.281  , page 154)'' is _s_e_t, then OpenSSL is used instead to create S/MIME
+       7.4.282  , page 155)'' is _s_e_t, then OpenSSL is used instead to create S/MIME
        messages and settings can be overridden by use of the _s_m_i_m_e_-_m_e_n_u.  (Crypto
        only)
 
-       _7_._4_._3_7  _c_r_y_p_t___a_u_t_o_p_g_p
+       _7_._4_._3_8  _c_r_y_p_t___a_u_t_o_p_g_p
 
        Type: boolean
 
@@ -4830,11 +4912,13 @@
 
        This variable controls whether or not Mutt-ng may automatically enable PGP
        encryption/signing for messages.  See also ``_$_c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t (section
-       7.4.36  , page 95)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.40  , page 96)'',
-       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.38  , page 95)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       7.4.41  , page 96)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.281  , page 154)''.
+       7.4.37  , page 96)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.41  , page 97)'',
+       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.39  , page 96)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
+       7.4.42  , page 97)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.282  , page 155)''.
 
-       _7_._4_._3_8  _c_r_y_p_t___a_u_t_o_s_i_g_n
+       The Mutt Next Generation E-Mail Client                                       97
+
+       _7_._4_._3_9  _c_r_y_p_t___a_u_t_o_s_i_g_n
 
        Type: boolean
 
@@ -4842,15 +4926,12 @@
 
        Setting this variable will cause Mutt-ng to always attempt to cryptographically
        sign outgoing messages.  This can be overridden by use of the _p_g_p_-_m_e_n_u, when
-
-       The Mutt Next Generation E-Mail Client                                       96
-
        signing is not required or encryption is requested as well. If
-       ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.281  , page 154)'' is _s_e_t, then OpenSSL is
+       ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.282  , page 155)'' is _s_e_t, then OpenSSL is
        used instead to create S/MIME messages and settings can be overridden by use of
        the _s_m_i_m_e_-_m_e_n_u.  (Crypto only)
 
-       _7_._4_._3_9  _c_r_y_p_t___a_u_t_o_s_m_i_m_e
+       _7_._4_._4_0  _c_r_y_p_t___a_u_t_o_s_m_i_m_e
 
        Type: boolean
 
@@ -4858,11 +4939,11 @@
 
        This variable controls whether or not Mutt-ng may automatically enable S/MIME
        encryption/signing for messages. See also ``_$_c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t (section
-       7.4.36  , page 95)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.40  , page 96)'',
-       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.38  , page 95)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       7.4.41  , page 96)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.281  , page 154)''.
+       7.4.37  , page 96)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.41  , page 97)'',
+       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.39  , page 96)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
+       7.4.42  , page 97)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.282  , page 155)''.
 
-       _7_._4_._4_0  _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t
+       _7_._4_._4_1  _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t
 
        Type: boolean
 
@@ -4871,7 +4952,7 @@
        If _s_e_t, automatically PGP or OpenSSL encrypt replies to messages which are
        encrypted.  (Crypto only)
 
-       _7_._4_._4_1  _c_r_y_p_t___r_e_p_l_y_s_i_g_n
+       _7_._4_._4_2  _c_r_y_p_t___r_e_p_l_y_s_i_g_n
 
        Type: boolean
 
@@ -4882,7 +4963,7 @@
        NNoottee:: this does not work on messages that are encrypted aanndd signed!  (Crypto
        only)
 
-       _7_._4_._4_2  _c_r_y_p_t___r_e_p_l_y_s_i_g_n_e_n_c_r_y_p_t_e_d
+       _7_._4_._4_3  _c_r_y_p_t___r_e_p_l_y_s_i_g_n_e_n_c_r_y_p_t_e_d
 
        Type: boolean
 
@@ -4890,17 +4971,18 @@
 
        If _s_e_t, automatically PGP or OpenSSL sign replies to messages which are
        encrypted. This makes sense in combination with ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section
-       7.4.40  , page 96)'', because it allows you to sign all messages which are
+       7.4.41  , page 97)'', because it allows you to sign all messages which are
+
+       The Mutt Next Generation E-Mail Client                                       98
+
        automatically encrypted.  This works around the problem noted in
-       ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section 7.4.41  , page 96)'', that Mutt-ng is not able to
+       ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section 7.4.42  , page 97)'', that Mutt-ng is not able to
        find out whether an encrypted message is also signed.  (Crypto only)
 
-       _7_._4_._4_3  _c_r_y_p_t___t_i_m_e_s_t_a_m_p
+       _7_._4_._4_4  _c_r_y_p_t___t_i_m_e_s_t_a_m_p
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                       97
-
        Default: yes
 
        If _s_e_t, Mutt-ng will include a time stamp in the lines surrounding PGP or
@@ -4908,7 +4990,7 @@
        ors to mark these lines, and rely on these, you may _u_n_s_e_t this setting.
        (Crypto only)
 
-       _7_._4_._4_4  _c_r_y_p_t___u_s_e___g_p_g_m_e
+       _7_._4_._4_5  _c_r_y_p_t___u_s_e___g_p_g_m_e
 
        Type: boolean
 
@@ -4921,7 +5003,7 @@
        NNoottee: You need to use this option in your .muttngrc configuration file as it
        won't have any effect when used interactively.
 
-       _7_._4_._4_5  _c_r_y_p_t___v_e_r_i_f_y___s_i_g
+       _7_._4_._4_6  _c_r_y_p_t___v_e_r_i_f_y___s_i_g
 
        Type: quadoption
 
@@ -4931,23 +5013,25 @@
        whether or not to verify the signature.  If ``_n_o'', never attempt to verify
        cryptographic signatures.  (Crypto only)
 
-       _7_._4_._4_6  _d_a_t_e___f_o_r_m_a_t
+       _7_._4_._4_7  _d_a_t_e___f_o_r_m_a_t
 
        Type: string
 
        Default: '!%a, %b %d, %Y at %I:%M:%S%p %Z'
 
        This variable controls the format of the date printed by the ``%d'' sequence in
-       ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113)''.  This is passed to strftime(3)
+       ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114)''.  This is passed to strftime(3)
        to process the date.
 
        Unless the first character in the string is a bang (``!''), the month and week
        day names are expanded according to the locale specified in the variable
-       ``_$_l_o_c_a_l_e (section 7.4.117  , page 116)''. If the first character in the string
+       ``_$_l_o_c_a_l_e (section 7.4.118  , page 117)''. If the first character in the 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).
 
-       _7_._4_._4_7  _d_e_f_a_u_l_t___h_o_o_k
+       The Mutt Next Generation E-Mail Client                                       99
+
+       _7_._4_._4_8  _d_e_f_a_u_l_t___h_o_o_k
 
        Type: string
 
@@ -4955,9 +5039,6 @@
 
        This variable controls how send-hooks, message-hooks, save-hooks, and fcc-hooks
        will be interpreted if they are specified with only a simple regexp, instead of
-
-       The Mutt Next Generation E-Mail Client                                       98
-
        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.  The default value matches if the message is either from a
@@ -4965,7 +5046,7 @@
        address matches ``alternates'') and is to or cc'ed to a user matching the given
        regular expression.
 
-       _7_._4_._4_8  _d_e_l_e_t_e
+       _7_._4_._4_9  _d_e_l_e_t_e
 
        Type: quadoption
 
@@ -4976,21 +5057,21 @@
        be purged without prompting.  If set to _n_o, messages marked for deletion will
        be kept in the mailbox.
 
-       _7_._4_._4_9  _d_e_l_e_t_e___s_p_a_c_e
+       _7_._4_._5_0  _d_e_l_e_t_e___s_p_a_c_e
 
        Type: boolean
 
        Default: no
 
-       When sending messages with format=flowed by _s_e_t_t_i_n_g the $text_flowed variable,
-       this variable specifies whether to also set the DelSp parameter to yes. If this
-       is _u_n_s_e_t, no additional parameter will be send as a value of no already is the
-       default behavior.
+       When sending messages with format=flowed by _s_e_t_t_i_n_g the _$_t_e_x_t___f_l_o_w_e_d (section
+       7.4.322  , page 167) variable, this variable specifies whether to also set the
+       DelSp parameter to yes. If this is _u_n_s_e_t, no additional parameter will be send
+       as a value of no already is the default behavior.
 
-       NNoottee:: this variable only has an effect on _o_u_t_g_o_i_n_g messages (if $text_flowed is
-       _s_e_t) but not on incomming.
+       NNoottee:: this variable only has an effect on _o_u_t_g_o_i_n_g messages (if _$_t_e_x_t___f_l_o_w_e_d
+       (section 7.4.322  , page 167) is _s_e_t) but not on incomming.
 
-       _7_._4_._5_0  _d_e_l_e_t_e___u_n_t_a_g
+       _7_._4_._5_1  _d_e_l_e_t_e___u_n_t_a_g
 
        Type: boolean
 
@@ -5000,29 +5081,29 @@
        tion.  This applies when you either explicitly delete a message, or when you
        save it to another folder.
 
-       _7_._4_._5_1  _d_i_g_e_s_t___c_o_l_l_a_p_s_e
+       _7_._4_._5_2  _d_i_g_e_s_t___c_o_l_l_a_p_s_e
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      100
+
        Default: yes
 
        If this option is _s_e_t, Mutt-ng's received-attachments menu will not show the
        subparts of individual messages in a multipart/digest.  To see these subparts,
        press 'v' on that menu.
 
-       _7_._4_._5_2  _d_i_s_p_l_a_y___f_i_l_t_e_r
-
-       The Mutt Next Generation E-Mail Client                                       99
+       _7_._4_._5_3  _d_i_s_p_l_a_y___f_i_l_t_e_r
 
        Type: path
 
        Default: ''
 
        When _s_e_t, specifies a command used to filter messages.  When a message is
-       viewed it is passed as standard input to _$_d_i_s_p_l_a_y___f_i_l_t_e_r (section 7.4.52  ,
-       page 98), and the filtered message is read from the standard output.
+       viewed it is passed as standard input to _$_d_i_s_p_l_a_y___f_i_l_t_e_r (section 7.4.53  ,
+       page 100), and the filtered message is read from the standard output.
 
-       _7_._4_._5_3  _d_o_t_l_o_c_k___p_r_o_g_r_a_m
+       _7_._4_._5_4  _d_o_t_l_o_c_k___p_r_o_g_r_a_m
 
        Type: path
 
@@ -5032,7 +5113,7 @@
 
        Contains the path of the muttng_dotlock(1) binary to be used by Mutt-ng.
 
-       _7_._4_._5_4  _d_s_n___n_o_t_i_f_y
+       _7_._4_._5_5  _d_s_n___n_o_t_i_f_y
 
        Type: string
 
@@ -5049,7 +5130,7 @@
 
        Example: set dsn_notify='failure,delay'
 
-       _7_._4_._5_5  _d_s_n___r_e_t_u_r_n
+       _7_._4_._5_6  _d_s_n___r_e_t_u_r_n
 
        Type: string
 
@@ -5060,16 +5141,17 @@
 
        This variable controls how much of your message is returned in DSN messages.
        It may be set to either _h_d_r_s to return just the message header, or _f_u_l_l to
+
+       The Mutt Next Generation E-Mail Client                                      101
+
        return the full message.
 
        Example: set dsn_return=hdrs
 
-       _7_._4_._5_6  _d_u_p_l_i_c_a_t_e___t_h_r_e_a_d_s
+       _7_._4_._5_7  _d_u_p_l_i_c_a_t_e___t_h_r_e_a_d_s
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      100
-
        Default: yes
 
        This variable controls whether Mutt-ng, when sorting by threads, threads mes-
@@ -5077,7 +5159,7 @@
        indicate that it thinks they are duplicates of each other with an equals sign
        in the thread diagram.
 
-       _7_._4_._5_7  _e_d_i_t___h_e_a_d_e_r_s
+       _7_._4_._5_8  _e_d_i_t___h_e_a_d_e_r_s
 
        Type: boolean
 
@@ -5086,7 +5168,7 @@
        This option allows you to edit the header of your outgoing messages along with
        the body of your message.
 
-       _7_._4_._5_8  _e_d_i_t_o_r
+       _7_._4_._5_9  _e_d_i_t_o_r
 
        Type: path
 
@@ -5096,7 +5178,7 @@
        value of the $VISUAL, or $EDITOR, environment variable, or to the string 'vi'
        if neither of those are set.
 
-       _7_._4_._5_9  _e_n_c_o_d_e___f_r_o_m
+       _7_._4_._6_0  _e_n_c_o_d_e___f_r_o_m
 
        Type: boolean
 
@@ -5112,10 +5194,12 @@
        Alternatively, you must take care of space-stuffing <tt/From / lines (with a
        trailing space) yourself.
 
-       _7_._4_._6_0  _e_n_t_r_o_p_y___f_i_l_e
+       _7_._4_._6_1  _e_n_t_r_o_p_y___f_i_l_e
 
        Type: path
 
+       The Mutt Next Generation E-Mail Client                                      102
+
        Default: ''
 
        Availability: SSL
@@ -5123,9 +5207,7 @@
        The file which includes random data that is used to initialize SSL library
        functions.
 
-       The Mutt Next Generation E-Mail Client                                      101
-
-       _7_._4_._6_1  _e_n_v_e_l_o_p_e___f_r_o_m
+       _7_._4_._6_2  _e_n_v_e_l_o_p_e___f_r_o_m
 
        Type: boolean
 
@@ -5134,10 +5216,10 @@
        When _s_e_t, Mutt-ng will try to derive the message's _e_n_v_e_l_o_p_e sender from the
        ``From:'' header field. Note that this information is passed to the sendmail
        command using the ``-f' command line switch, so don't set this option if you
-       are using that switch in _$_s_e_n_d_m_a_i_l (section 7.4.251  , page 147) yourself, or
+       are using that switch in _$_s_e_n_d_m_a_i_l (section 7.4.252  , page 148) yourself, or
        if the sendmail on your machine doesn't support that command line switch.
 
-       _7_._4_._6_2  _e_s_c_a_p_e
+       _7_._4_._6_3  _e_s_c_a_p_e
 
        Type: string
 
@@ -5145,7 +5227,7 @@
 
        Escape character to use for functions in the builtin editor.
 
-       _7_._4_._6_3  _f_a_s_t___r_e_p_l_y
+       _7_._4_._6_4  _f_a_s_t___r_e_p_l_y
 
        Type: boolean
 
@@ -5155,10 +5237,10 @@
        ing to messages, and the initial prompt for subject is skipped when forwarding
        messages.
 
-       NNoottee:: this variable has no effect when the ``_$_a_u_t_o_e_d_i_t (section 7.4.19  , page
-       91)'' variable is _s_e_t.
+       NNoottee:: this variable has no effect when the ``_$_a_u_t_o_e_d_i_t (section 7.4.20  , page
+       92)'' variable is _s_e_t.
 
-       _7_._4_._6_4  _f_c_c___a_t_t_a_c_h
+       _7_._4_._6_5  _f_c_c___a_t_t_a_c_h
 
        Type: boolean
 
@@ -5167,25 +5249,25 @@
        This variable controls whether or not attachments on outgoing messages are
        saved along with the main body of your message.
 
-       _7_._4_._6_5  _f_c_c___c_l_e_a_r
+       _7_._4_._6_6  _f_c_c___c_l_e_a_r
 
        Type: boolean
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      103
+
        When this variable is _s_e_t, FCCs will be stored unencrypted and unsigned, even
        when the actual message is encrypted and/or signed.  (PGP only)
 
-       _7_._4_._6_6  _f_i_l_e___c_h_a_r_s_e_t
+       _7_._4_._6_7  _f_i_l_e___c_h_a_r_s_e_t
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      102
-
        Default: ''
 
        This variable is a colon-separated list of character encoding schemes for text
-       file attatchments.  If _u_n_s_e_t, _$_c_h_a_r_s_e_t (section 7.4.26  , page 93) value will
+       file attatchments.  If _u_n_s_e_t, _$_c_h_a_r_s_e_t (section 7.4.27  , page 94) value will
        be used instead.  For example, the following configuration would work for
        Japanese text handling:
 
@@ -5194,7 +5276,7 @@
        Note: ``iso-2022-*'' must be put at the head of the value as shown above if
        included.
 
-       _7_._4_._6_7  _f_o_l_d_e_r
+       _7_._4_._6_8  _f_o_l_d_e_r
 
        Type: path
 
@@ -5206,15 +5288,15 @@
        that the assignment occurs _b_e_f_o_r_e you use ``+'' or ``='' for any other vari-
        ables since expansion takes place during the ``set'' command.
 
-       _7_._4_._6_8  _f_o_l_d_e_r___f_o_r_m_a_t
+       _7_._4_._6_9  _f_o_l_d_e_r___f_o_r_m_a_t
 
        Type: string
 
        Default: '%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f'
 
        This variable allows you to customize the file browser display to your personal
-       taste.  This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page
-       113)'', but has its own set of printf(3)-like sequences:
+       taste.  This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page
+       114)'', but has its own set of printf(3)-like sequences:
 
              %C
                    current file number
@@ -5228,6 +5310,8 @@
              %F
                    file permissions
 
+       The Mutt Next Generation E-Mail Client                                      104
+
              %g
                    group name (or numeric gid, if missing)
 
@@ -5237,8 +5321,6 @@
              %N
                    N if folder has new mail, blank otherwise
 
-       The Mutt Next Generation E-Mail Client                                      103
-
              %s
                    size in bytes
 
@@ -5254,7 +5336,7 @@
              %|X
                    pad to the end of the line with character 'X'
 
-       _7_._4_._6_9  _f_o_l_l_o_w_u_p___t_o
+       _7_._4_._7_0  _f_o_l_l_o_w_u_p___t_o
 
        Type: boolean
 
@@ -5263,7 +5345,7 @@
        Controls whether or not the Mail-Followup-To: header field is generated when
        sending mail.  When _s_e_t, Mutt-ng will generate this field when you are replying
        to a known mailing list, specified with the ``subscribe'' or ``_l_i_s_t_s (section
-       3.12  , page 33)'' commands or detected by common mailing list headers.
+       3.13  , page 34)'' commands or detected by common mailing list headers.
 
        This field has two purposes.  First, preventing you from receiving duplicate
        copies of replies to messages which you send to mailing lists. Second, ensuring
@@ -5274,7 +5356,7 @@
        a subscribed list will be sent to both the list and your address, resulting in
        two copies of the same email for you.
 
-       _7_._4_._7_0  _f_o_r_c_e___b_u_f_f_y___c_h_e_c_k
+       _7_._4_._7_1  _f_o_r_c_e___b_u_f_f_y___c_h_e_c_k
 
        Type: boolean
 
@@ -5284,25 +5366,25 @@
        is invoked. When _u_n_s_e_t, _b_u_f_f_y___l_i_s_t will just list all mailboxes which are
        already known to have new mail.
 
-       Also see the following variables: ``_$_t_i_m_e_o_u_t (section 7.4.325  , page 166)'',
-       ``_$_m_a_i_l___c_h_e_c_k (section 7.4.118  , page 116)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
-       7.4.102  , page 110)''.
+       The Mutt Next Generation E-Mail Client                                      105
+
+       Also see the following variables: ``_$_t_i_m_e_o_u_t (section 7.4.326  , page 168)'',
+       ``_$_m_a_i_l___c_h_e_c_k (section 7.4.119  , page 117)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
+       7.4.103  , page 111)''.
 
-       _7_._4_._7_1  _f_o_r_c_e___n_a_m_e
+       _7_._4_._7_2  _f_o_r_c_e___n_a_m_e
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      104
-
-       This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 7.4.245  , page 146)'',
+       This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 7.4.246  , page 147)'',
        except that Mutt-ng will store a copy of your outgoing message by the username
        of the address you are sending to even if that mailbox does not exist.
 
-       Also see the ``_$_r_e_c_o_r_d (section 7.4.234  , page 143)'' variable.
+       Also see the ``_$_r_e_c_o_r_d (section 7.4.235  , page 144)'' variable.
 
-       _7_._4_._7_2  _f_o_r_w_a_r_d___d_e_c_o_d_e
+       _7_._4_._7_3  _f_o_r_w_a_r_d___d_e_c_o_d_e
 
        Type: boolean
 
@@ -5310,10 +5392,10 @@
 
        Controls the decoding of complex MIME messages into text/plain when forwarding
        a message.  The message header is also RFC2047 decoded.  This variable is only
-       used, if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.140  , page 120)'' is _u_n_s_e_t, otherwise
-       ``_$_m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.141  , page 121)'' is used instead.
+       used, if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.141  , page 121)'' is _u_n_s_e_t, otherwise
+       ``_$_m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.142  , page 122)'' is used instead.
 
-       _7_._4_._7_3  _f_o_r_w_a_r_d___d_e_c_r_y_p_t
+       _7_._4_._7_4  _f_o_r_w_a_r_d___d_e_c_r_y_p_t
 
        Type: boolean
 
@@ -5321,10 +5403,10 @@
 
        Controls the handling of encrypted messages when forwarding a message.  When
        _s_e_t, the outer layer of encryption is stripped off.  This variable is only used
-       if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.140  , page 120)'' is _s_e_t and ``_$_m_i_m_e___f_o_r_-
-       _w_a_r_d___d_e_c_o_d_e (section 7.4.141  , page 121)'' is _u_n_s_e_t.  (PGP only)
+       if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.141  , page 121)'' is _s_e_t and ``_$_m_i_m_e___f_o_r_-
+       _w_a_r_d___d_e_c_o_d_e (section 7.4.142  , page 122)'' is _u_n_s_e_t.  (PGP only)
 
-       _7_._4_._7_4  _f_o_r_w_a_r_d___e_d_i_t
+       _7_._4_._7_5  _f_o_r_w_a_r_d___e_d_i_t
 
        Type: quadoption
 
@@ -5334,38 +5416,38 @@
        editor when forwarding messages.  For those who always want to forward with no
        modification, use a setting of _n_o.
 
-       _7_._4_._7_5  _f_o_r_w_a_r_d___f_o_r_m_a_t
+       _7_._4_._7_6  _f_o_r_w_a_r_d___f_o_r_m_a_t
 
        Type: string
 
        Default: '[%a: %s]'
 
+       The Mutt Next Generation E-Mail Client                                      106
+
        This variable controls the default subject when forwarding a message.  It uses
-       the same format sequences as the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page
-       113)'' variable.
+       the same format sequences as the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page
+       114)'' variable.
 
-       _7_._4_._7_6  _f_o_r_w_a_r_d___q_u_o_t_e
+       _7_._4_._7_7  _f_o_r_w_a_r_d___q_u_o_t_e
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      105
-
        When _s_e_t forwarded messages included in the main body of the message (when
-       ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.140  , page 120)'' is _u_n_s_e_t) will be quoted using
-       ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.112  , page 113)''.
+       ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.141  , page 121)'' is _u_n_s_e_t) will be quoted using
+       ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.113  , page 114)''.
 
-       _7_._4_._7_7  _f_r_o_m
+       _7_._4_._7_8  _f_r_o_m
 
        Type: e-mail address
 
        Default: ''
 
        This variable contains a default from address.  It can be overridden using
-       my_hdr (including from send-hooks) and ``_$_r_e_v_e_r_s_e___n_a_m_e (section 7.4.240  , page
-       145)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 7.4.334  , page
-       168)'' is unset.
+       my_hdr (including from send-hooks) and ``_$_r_e_v_e_r_s_e___n_a_m_e (section 7.4.241  , page
+       146)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 7.4.335  , page
+       170)'' is unset.
 
        E.g. you can use send-hook Mutt-ng-devel@lists.berlios.de 'my_hdr From: Foo Bar
        <foo@bar.fb>' when replying to the mutt-ng developer's mailing list and Mutt-ng
@@ -5373,7 +5455,7 @@
 
        Defaults to the contents of the environment variable $EMAIL.
 
-       _7_._4_._7_8  _g_e_c_o_s___m_a_s_k
+       _7_._4_._7_9  _g_e_c_o_s___m_a_s_k
 
        Type: regular expression
 
@@ -5391,30 +5473,30 @@
        expression that will match the whole name so Mutt-ng will expand ``Franklin''
        to ``Franklin, Steve''.
 
-       _7_._4_._7_9  _h_d_r_s
+       _7_._4_._8_0  _h_d_r_s
 
        Type: boolean
 
        Default: yes
 
-       When _u_n_s_e_t, the header fields normally added by the ``_m_y___h_d_r (section 3.15  ,
-       page 35)'' command are not created.  This variable _m_u_s_t be _u_n_s_e_t before compos-
+       The Mutt Next Generation E-Mail Client                                      107
+
+       When _u_n_s_e_t, the header fields normally added by the ``_m_y___h_d_r (section 3.16  ,
+       page 36)'' command are not created.  This variable _m_u_s_t be _u_n_s_e_t before compos-
        ing a new message or replying in order to take effect.  If _s_e_t, the user
        defined header fields are added to every new message.
 
-       _7_._4_._8_0  _h_e_a_d_e_r
+       _7_._4_._8_1  _h_e_a_d_e_r
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      106
-
        Default: no
 
        When _s_e_t, this variable causes Mutt-ng to include the header of the message you
        are replying to into the edit buffer.  The ``_$_w_e_e_d (section 7.4.340  , page
-       170)'' setting applies.
+       171)'' setting applies.
 
-       _7_._4_._8_1  _h_e_a_d_e_r___c_a_c_h_e
+       _7_._4_._8_2  _h_e_a_d_e_r___c_a_c_h_e
 
        Type: path
 
@@ -5422,15 +5504,15 @@
 
        Availability: Header Cache
 
-       The _$_h_e_a_d_e_r___c_a_c_h_e (section 7.4.81  , page 106) variable points to the header
+       The _$_h_e_a_d_e_r___c_a_c_h_e (section 7.4.82  , page 107) variable points to the header
        cache database.
 
-       If _$_h_e_a_d_e_r___c_a_c_h_e (section 7.4.81  , page 106) points to a directory it will
+       If _$_h_e_a_d_e_r___c_a_c_h_e (section 7.4.82  , page 107) points to a directory it will
        contain a header cache database  per folder. If _$_h_e_a_d_e_r___c_a_c_h_e (section
-       7.4.81  , page 106) points to a file that file will be a single global header
+       7.4.82  , page 107) points to a file that file will be a single global header
        cache. By default it is _u_n_s_e_t so no header caching will be used.
 
-       _7_._4_._8_2  _h_e_a_d_e_r___c_a_c_h_e___c_o_m_p_r_e_s_s
+       _7_._4_._8_3  _h_e_a_d_e_r___c_a_c_h_e___c_o_m_p_r_e_s_s
 
        Type: boolean
 
@@ -5440,7 +5522,7 @@
        diskspace is used, but the uncompression can result in a slower open of the
        cached folder.
 
-       _7_._4_._8_3  _h_e_l_p
+       _7_._4_._8_4  _h_e_l_p
 
        Type: boolean
 
@@ -5452,24 +5534,24 @@
        NNoottee:: The binding will not be displayed correctly if the function is bound to a
        sequence rather than a single keystroke.  Also, the help line may not be
        updated if a binding is changed while Mutt-ng is running.  Since this variable
-       is primarily aimed at new users, neither of these should present a major prob-
-       lem.
+       is primarily aimed at new users, neither of these should present a major
+
+       The Mutt Next Generation E-Mail Client                                      108
+
+       problem.
 
-       _7_._4_._8_4  _h_i_d_d_e_n___h_o_s_t
+       _7_._4_._8_5  _h_i_d_d_e_n___h_o_s_t
 
        Type: boolean
 
        Default: no
 
        When _s_e_t, Mutt-ng will skip the host name part of ``_$_h_o_s_t_n_a_m_e (section
-
-       The Mutt Next Generation E-Mail Client                                      107
-
-       7.4.92  , page 108)'' variable when adding the domain part to addresses.  This
+       7.4.93  , page 109)'' variable when adding the domain part to addresses.  This
        variable does not affect the generation of Message-ID: header fields, and it
        will not lead to the cut-off of first-level domains.
 
-       _7_._4_._8_5  _h_i_d_e___l_i_m_i_t_e_d
+       _7_._4_._8_6  _h_i_d_e___l_i_m_i_t_e_d
 
        Type: boolean
 
@@ -5478,7 +5560,7 @@
        When _s_e_t, Mutt-ng will not show the presence of messages that are hidden by
        limiting, in the thread tree.
 
-       _7_._4_._8_6  _h_i_d_e___m_i_s_s_i_n_g
+       _7_._4_._8_7  _h_i_d_e___m_i_s_s_i_n_g
 
        Type: boolean
 
@@ -5487,7 +5569,7 @@
        When _s_e_t, Mutt-ng will not show the presence of missing messages in the thread
        tree.
 
-       _7_._4_._8_7  _h_i_d_e___t_h_r_e_a_d___s_u_b_j_e_c_t
+       _7_._4_._8_8  _h_i_d_e___t_h_r_e_a_d___s_u_b_j_e_c_t
 
        Type: boolean
 
@@ -5496,7 +5578,7 @@
        When _s_e_t, Mutt-ng will not show the subject of messages in the thread tree that
        have the same subject as their parent or closest previously displayed sibling.
 
-       _7_._4_._8_8  _h_i_d_e___t_o_p___l_i_m_i_t_e_d
+       _7_._4_._8_9  _h_i_d_e___t_o_p___l_i_m_i_t_e_d
 
        Type: boolean
 
@@ -5504,30 +5586,30 @@
 
        When _s_e_t, Mutt-ng will not show the presence of messages that are hidden by
        limiting, at the top of threads in the thread tree.  Note that when _$_h_i_d_e___m_i_s_s_-
-       _i_n_g (section 7.4.86  , page 107) is set, this option will have no effect.
+       _i_n_g (section 7.4.87  , page 108) is set, this option will have no effect.
 
-       _7_._4_._8_9  _h_i_d_e___t_o_p___m_i_s_s_i_n_g
+       _7_._4_._9_0  _h_i_d_e___t_o_p___m_i_s_s_i_n_g
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      109
+
        Default: yes
 
        When _s_e_t, Mutt-ng will not show the presence of missing messages at the top of
-       threads in the thread tree.  Note that when _$_h_i_d_e___l_i_m_i_t_e_d (section 7.4.85  ,
-       page 107) is _s_e_t, this option will have no effect.
+       threads in the thread tree.  Note that when _$_h_i_d_e___l_i_m_i_t_e_d (section 7.4.86  ,
+       page 108) is _s_e_t, this option will have no effect.
 
-       _7_._4_._9_0  _h_i_s_t_o_r_y
+       _7_._4_._9_1  _h_i_s_t_o_r_y
 
        Type: number
 
-       The Mutt Next Generation E-Mail Client                                      108
-
        Default: 10
 
        This variable controls the size (in number of strings remembered) of the string
        history buffer. The buffer is cleared each time the variable is changed.
 
-       _7_._4_._9_1  _h_o_n_o_r___f_o_l_l_o_w_u_p___t_o
+       _7_._4_._9_2  _h_o_n_o_r___f_o_l_l_o_w_u_p___t_o
 
        Type: quadoption
 
@@ -5536,7 +5618,7 @@
        This variable controls whether or not a Mail-Followup-To: header field is hon-
        ored when group-replying to a message.
 
-       _7_._4_._9_2  _h_o_s_t_n_a_m_e
+       _7_._4_._9_3  _h_o_s_t_n_a_m_e
 
        Type: string
 
@@ -5548,7 +5630,7 @@
        Please be sure to really know what you are doing when changing this variable to
        configure a custom domain part of Message-IDs.
 
-       _7_._4_._9_3  _i_g_n_o_r_e___l_i_s_t___r_e_p_l_y___t_o
+       _7_._4_._9_4  _i_g_n_o_r_e___l_i_s_t___r_e_p_l_y___t_o
 
        Type: boolean
 
@@ -5562,10 +5644,12 @@
        option is set, use the _l_i_s_t_-_r_e_p_l_y function; _g_r_o_u_p_-_r_e_p_l_y will reply to both the
        sender and the list.
 
-       _7_._4_._9_4  _i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
+       _7_._4_._9_5  _i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      110
+
        Default: ''
 
        Availability: IMAP
@@ -5576,8 +5660,6 @@
        capability string, e.g. ``digest-md5'', ``gssapi'' or ``cram-md5''. This param-
        eter is case-insensitive.
 
-       The Mutt Next Generation E-Mail Client                                      109
-
        If this parameter is _u_n_s_e_t (the default) Mutt-ng will try all available meth-
        ods, in order from most-secure to least-secure.
 
@@ -5587,7 +5669,7 @@
        ous methods are unavailable. If a method is available but authentication fails,
        Mutt-ng will not connect to the IMAP server.
 
-       _7_._4_._9_5  _i_m_a_p___c_h_e_c_k___s_u_b_s_c_r_i_b_e_d
+       _7_._4_._9_6  _i_m_a_p___c_h_e_c_k___s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
@@ -5595,9 +5677,9 @@
 
        When _s_e_t, mutt will fetch the set of subscribed folders from your server on
        connection, and add them to the set of mailboxes it polls for new mail. See
-       also the ``_m_a_i_l_b_o_x_e_s (section 3.14  , page 34)'' command.
+       also the ``_m_a_i_l_b_o_x_e_s (section 3.15  , page 36)'' command.
 
-       _7_._4_._9_6  _i_m_a_p___d_e_l_i_m___c_h_a_r_s
+       _7_._4_._9_7  _i_m_a_p___d_e_l_i_m___c_h_a_r_s
 
        Type: string
 
@@ -5607,9 +5689,9 @@
 
        This contains the list of characters which you would like to treat as folder
        separators for displaying IMAP paths. In particular it helps in using the '='
-       shortcut for your _$_f_o_l_d_e_r (section 7.4.67  , page 102) variable.
+       shortcut for your _$_f_o_l_d_e_r (section 7.4.68  , page 103) variable.
 
-       _7_._4_._9_7  _i_m_a_p___h_e_a_d_e_r_s
+       _7_._4_._9_8  _i_m_a_p___h_e_a_d_e_r_s
 
        Type: string
 
@@ -5622,9 +5704,11 @@
        REPLY-TO REPLY-TO LINES X-LABEL'') from IMAP servers before displaying the
        ``index'' menu. You may want to add more headers for spam detection.
 
+       The Mutt Next Generation E-Mail Client                                      111
+
        NNoottee:: This is a space separated list.
 
-       _7_._4_._9_8  _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e
+       _7_._4_._9_9  _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e
 
        Type: string
 
@@ -5632,13 +5716,11 @@
 
        Availability: IMAP
 
-       The Mutt Next Generation E-Mail Client                                      110
-
        You normally want to see your personal folders alongside your INBOX in the IMAP
        browser. If you see something else, you may set this variable to the IMAP path
        to your folders.
 
-       _7_._4_._9_9  _i_m_a_p___k_e_e_p_a_l_i_v_e
+       _7_._4_._1_0_0  _i_m_a_p___k_e_e_p_a_l_i_v_e
 
        Type: number
 
@@ -5657,7 +5739,7 @@
        Reduce this number if you find yourself getting disconnected from your IMAP
        server due to inactivity.
 
-       _7_._4_._1_0_0  _i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d
+       _7_._4_._1_0_1  _i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
@@ -5669,7 +5751,7 @@
        scribed folders or all folders.  This can be toggled in the IMAP browser with
        the _t_o_g_g_l_e_-_s_u_b_s_c_r_i_b_e_d function.
 
-       _7_._4_._1_0_1  _i_m_a_p___l_o_g_i_n
+       _7_._4_._1_0_2  _i_m_a_p___l_o_g_i_n
 
        Type: string
 
@@ -5679,23 +5761,23 @@
 
        Your login name on the IMAP server.
 
-       This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 7.4.108  , page
-       112).''
+       The Mutt Next Generation E-Mail Client                                      112
+
+       This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 7.4.109  , page
+       113).''
 
-       _7_._4_._1_0_2  _i_m_a_p___m_a_i_l___c_h_e_c_k
+       _7_._4_._1_0_3  _i_m_a_p___m_a_i_l___c_h_e_c_k
 
        Type: number
 
        Default: 300
 
-       The Mutt Next Generation E-Mail Client                                      111
-
        This variable configures how often (in seconds) Mutt-ng should look for new
-       mail in IMAP folders. This is split from the ``_m_a_i_l___c_h_e_c_k (section 7.4.118  ,
-       page 116)'' variable to generate less traffic and get more accurate information
+       mail in IMAP folders. This is split from the ``_m_a_i_l___c_h_e_c_k (section 7.4.119  ,
+       page 117)'' variable to generate less traffic and get more accurate information
        for local folders.
 
-       _7_._4_._1_0_3  _i_m_a_p___p_a_s_s
+       _7_._4_._1_0_4  _i_m_a_p___p_a_s_s
 
        Type: string
 
@@ -5710,7 +5792,7 @@
        machine, because the superuser can read your configuration even if you are the
        only one who can read the file.
 
-       _7_._4_._1_0_4  _i_m_a_p___p_a_s_s_i_v_e
+       _7_._4_._1_0_5  _i_m_a_p___p_a_s_s_i_v_e
 
        Type: boolean
 
@@ -5723,7 +5805,7 @@
        useful if you don't want to be prompted to user/password pairs on Mutt-ng invo-
        cation, or if opening the connection is slow.
 
-       _7_._4_._1_0_5  _i_m_a_p___p_e_e_k
+       _7_._4_._1_0_6  _i_m_a_p___p_e_e_k
 
        Type: boolean
 
@@ -5736,7 +5818,9 @@
        closing an IMAP folder somewhat slower. This option exists to appease speed
        freaks.
 
-       _7_._4_._1_0_6  _i_m_a_p___r_e_c_o_n_n_e_c_t
+       The Mutt Next Generation E-Mail Client                                      113
+
+       _7_._4_._1_0_7  _i_m_a_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
 
@@ -5744,12 +5828,10 @@
 
        Availability: IMAP
 
-       The Mutt Next Generation E-Mail Client                                      112
-
        Controls whether or not Mutt-ng will try to reconnect to IMAP server when the
        connection is lost.
 
-       _7_._4_._1_0_7  _i_m_a_p___s_e_r_v_e_r_n_o_i_s_e
+       _7_._4_._1_0_8  _i_m_a_p___s_e_r_v_e_r_n_o_i_s_e
 
        Type: boolean
 
@@ -5762,7 +5844,7 @@
        ration problems on the server which are out of the users' hands, you may wish
        to suppress them at some point.
 
-       _7_._4_._1_0_8  _i_m_a_p___u_s_e_r
+       _7_._4_._1_0_9  _i_m_a_p___u_s_e_r
 
        Type: string
 
@@ -5774,7 +5856,7 @@
 
        This variable defaults to your user name on the local machine.
 
-       _7_._4_._1_0_9  _i_m_p_l_i_c_i_t___a_u_t_o_v_i_e_w
+       _7_._4_._1_1_0  _i_m_p_l_i_c_i_t___a_u_t_o_v_i_e_w
 
        Type: boolean
 
@@ -5785,27 +5867,28 @@
        If such an entry is found, Mutt-ng will use the viewer defined in that entry to
        convert the body part to text form.
 
-       _7_._4_._1_1_0  _i_n_c_l_u_d_e
+       _7_._4_._1_1_1  _i_n_c_l_u_d_e
 
        Type: quadoption
 
        Default: ask-yes
 
        Controls whether or not a copy of the message(s) you are replying to is
+
+       The Mutt Next Generation E-Mail Client                                      114
+
        included in your reply.
 
-       _7_._4_._1_1_1  _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t
+       _7_._4_._1_1_2  _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      113
-
        Controls whether or not Mutt-ng includes only the first attachment of the mes-
        sage you are replying.
 
-       _7_._4_._1_1_2  _i_n_d_e_n_t___s_t_r_i_n_g
+       _7_._4_._1_1_3  _i_n_d_e_n_t___s_t_r_i_n_g
 
        Type: string
 
@@ -5815,7 +5898,7 @@
        which you are replying.  You are strongly encouraged not to change this value,
        as it tends to agitate the more fanatical netizens.
 
-       _7_._4_._1_1_3  _i_n_d_e_x___f_o_r_m_a_t
+       _7_._4_._1_1_4  _i_n_d_e_x___f_o_r_m_a_t
 
        Type: string
 
@@ -5847,6 +5930,8 @@
              %C
                    current message number
 
+       The Mutt Next Generation E-Mail Client                                      115
+
              %d
                    date and time of the message in the format specified by ``date_for-
                    mat'' converted to sender's time zone
@@ -5855,8 +5940,6 @@
                    date and time of the message in the format specified by ``date_for-
                    mat'' converted to the local time zone
 
-       The Mutt Next Generation E-Mail Client                                      114
-
              %e
                    current message number in thread
 
@@ -5903,6 +5986,8 @@
                    (_O_riginal save folder)  Where Mutt-ng would formerly have stashed
                    the message: list name or recipient name if no list
 
+       The Mutt Next Generation E-Mail Client                                      116
+
              %s
                    subject of the message
 
@@ -5912,11 +5997,9 @@
              %t
                    `to:' field (recipients)
 
-       The Mutt Next Generation E-Mail Client                                      115
-
              %T
-                   the appropriate character from the _$_t_o___c_h_a_r_s (section 7.4.327  ,
-                   page 167) string
+                   the appropriate character from the _$_t_o___c_h_a_r_s (section 7.4.328  ,
+                   page 168) string
 
              %u
                    user (login) name of the author
@@ -5958,17 +6041,17 @@
                    the current local time. ``fmt'' is expanded by the library function
                    ``strftime''; a leading bang disables locales.
 
+       The Mutt Next Generation E-Mail Client                                      117
+
              %>X
                    right justify the rest of the string and pad with character 'X'
 
              %|X
                    pad to the end of the line with character 'X'
 
-       See also: ``_$_t_o___c_h_a_r_s (section 7.4.327  , page 167)''.
-
-       _7_._4_._1_1_4  _i_s_p_e_l_l
+       See also: ``_$_t_o___c_h_a_r_s (section 7.4.328  , page 168)''.
 
-       The Mutt Next Generation E-Mail Client                                      116
+       _7_._4_._1_1_5  _i_s_p_e_l_l
 
        Type: path
 
@@ -5976,17 +6059,17 @@
 
        How to invoke ispell (GNU's spell-checking software).
 
-       _7_._4_._1_1_5  _k_e_e_p___f_l_a_g_g_e_d
+       _7_._4_._1_1_6  _k_e_e_p___f_l_a_g_g_e_d
 
        Type: boolean
 
        Default: no
 
        If _s_e_t, read messages marked as flagged will not be moved from your spool mail-
-       box to your ``_$_m_b_o_x (section 7.4.128  , page 118)'' mailbox, or as a result of
-       a ``_m_b_o_x_-_h_o_o_k (section 3.13  , page 34)'' command.
+       box to your ``_$_m_b_o_x (section 7.4.129  , page 119)'' mailbox, or as a result of
+       a ``_m_b_o_x_-_h_o_o_k (section 3.14  , page 35)'' command.
 
-       _7_._4_._1_1_6  _l_i_s_t___r_e_p_l_y
+       _7_._4_._1_1_7  _l_i_s_t___r_e_p_l_y
 
        Type: quadoption
 
@@ -5996,7 +6079,7 @@
        (instead to the author only). Setting this option to ``_a_s_k_-_y_e_s'' or ``_a_s_k_-_n_o''
        will ask if you really intended to reply to the author only.
 
-       _7_._4_._1_1_7  _l_o_c_a_l_e
+       _7_._4_._1_1_8  _l_o_c_a_l_e
 
        Type: string
 
@@ -6005,7 +6088,7 @@
        The locale used by strftime(3) to format dates. Legal values are the strings
        your system accepts for the locale variable LC_TIME.
 
-       _7_._4_._1_1_8  _m_a_i_l___c_h_e_c_k
+       _7_._4_._1_1_9  _m_a_i_l___c_h_e_c_k
 
        Type: number
 
@@ -6014,22 +6097,21 @@
        This variable configures how often (in seconds) Mutt-ng should look for new
        mail.
 
+       The Mutt Next Generation E-Mail Client                                      118
+
        NNoottee:: This does not apply to IMAP mailboxes, see _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
-       7.4.102  , page 110).
+       7.4.103  , page 111).
 
-       _7_._4_._1_1_9  _m_a_i_l_c_a_p___p_a_t_h
+       _7_._4_._1_2_0  _m_a_i_l_c_a_p___p_a_t_h
 
        Type: string
 
        Default: ''
 
        This variable specifies which files to consult when attempting to display MIME
-
-       The Mutt Next Generation E-Mail Client                                      117
-
        bodies not directly supported by Mutt-ng.
 
-       _7_._4_._1_2_0  _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e
+       _7_._4_._1_2_1  _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e
 
        Type: boolean
 
@@ -6041,7 +6123,7 @@
 
        DDOONN''TT CCHHAANNGGEE TTHHIISS SSEETTTTIINNGG UUNNLLEESSSS YYOOUU AARREE RREEAALLLLYY SSUURREE WWHHAATT YYOOUU AARREE DDOOIINNGG!!
 
-       _7_._4_._1_2_1  _m_a_i_l_d_i_r___h_e_a_d_e_r___c_a_c_h_e___v_e_r_i_f_y
+       _7_._4_._1_2_2  _m_a_i_l_d_i_r___h_e_a_d_e_r___c_a_c_h_e___v_e_r_i_f_y
 
        Type: boolean
 
@@ -6053,7 +6135,7 @@
        files when the header cache is in use. This incurs one stat(2) per message
        every time the folder is opened.
 
-       _7_._4_._1_2_2  _m_a_i_l_d_i_r___t_r_a_s_h
+       _7_._4_._1_2_3  _m_a_i_l_d_i_r___t_r_a_s_h
 
        Type: boolean
 
@@ -6067,10 +6149,12 @@
 
        It is similiar to the trash option.
 
-       _7_._4_._1_2_3  _m_a_r_k___o_l_d
+       _7_._4_._1_2_4  _m_a_r_k___o_l_d
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      119
+
        Default: yes
 
        Controls whether or not Mutt-ng marks _n_e_w uunnrreeaadd messages as _o_l_d if you exit a
@@ -6080,9 +6164,7 @@
        up with an 'O' next to them in the ``index'' menu, indicating that they are
        old.
 
-       The Mutt Next Generation E-Mail Client                                      118
-
-       _7_._4_._1_2_4  _m_a_r_k_e_r_s
+       _7_._4_._1_2_5  _m_a_r_k_e_r_s
 
        Type: boolean
 
@@ -6090,9 +6172,9 @@
 
        Controls the display of wrapped lines in the internal pager. If set, a ``+''
        marker is displayed at the beginning of wrapped lines. Also see the
-       ``_$_s_m_a_r_t___w_r_a_p (section 7.4.267  , page 151)'' variable.
+       ``_$_s_m_a_r_t___w_r_a_p (section 7.4.268  , page 152)'' variable.
 
-       _7_._4_._1_2_5  _m_a_s_k
+       _7_._4_._1_2_6  _m_a_s_k
 
        Type: regular expression
 
@@ -6102,7 +6184,7 @@
        operator ``!''.  Only files whose names match this mask will be shown. The
        match is always case-sensitive.
 
-       _7_._4_._1_2_6  _m_a_x___d_i_s_p_l_a_y___r_e_c_i_p_s
+       _7_._4_._1_2_7  _m_a_x___d_i_s_p_l_a_y___r_e_c_i_p_s
 
        Type: number
 
@@ -6113,7 +6195,7 @@
        case the number of lines exeeds its value, the last line will have 3 dots
        appended.
 
-       _7_._4_._1_2_7  _m_a_x___l_i_n_e___l_e_n_g_t_h
+       _7_._4_._1_2_8  _m_a_x___l_i_n_e___l_e_n_g_t_h
 
        Type: number
 
@@ -6122,39 +6204,39 @@
        When _s_e_t, the maximum line length for displaying ``format = flowed'' messages
        is limited to this length. A value of 0 (which is also the default) means that
        the maximum line length is determined by the terminal width and _$_w_r_a_p_m_a_r_g_i_n
-       (section 7.4.342  , page 170).
+       (section 7.4.342  , page 171).
 
-       _7_._4_._1_2_8  _m_b_o_x
+       _7_._4_._1_2_9  _m_b_o_x
 
        Type: path
 
+       The Mutt Next Generation E-Mail Client                                      120
+
        Default: '~/mbox'
 
        This specifies the folder into which read mail in your ``_$_s_p_o_o_l_f_i_l_e (section
-       7.4.301  , page 159)'' folder will be appended.
+       7.4.302  , page 160)'' folder will be appended.
 
-       _7_._4_._1_2_9  _m_b_o_x___t_y_p_e
+       _7_._4_._1_3_0  _m_b_o_x___t_y_p_e
 
        Type: folder magic
 
-       The Mutt Next Generation E-Mail Client                                      119
-
        Default: mbox
 
        The default mailbox type used when creating new folders. May be any of mbox,
        MMDF, MH and Maildir.
 
-       _7_._4_._1_3_0  _m_e_n_u___c_o_n_t_e_x_t
+       _7_._4_._1_3_1  _m_e_n_u___c_o_n_t_e_x_t
 
        Type: number
 
        Default: 0
 
        This variable controls the number of lines of context that are given when
-       scrolling through menus. (Similar to ``_$_p_a_g_e_r___c_o_n_t_e_x_t (section 7.4.171  , page
-       129)''.)
+       scrolling through menus. (Similar to ``_$_p_a_g_e_r___c_o_n_t_e_x_t (section 7.4.172  , page
+       130)''.)
 
-       _7_._4_._1_3_1  _m_e_n_u___m_o_v_e___o_f_f
+       _7_._4_._1_3_2  _m_e_n_u___m_o_v_e___o_f_f
 
        Type: boolean
 
@@ -6164,7 +6246,7 @@
        the screen, unless there are less entries than lines.  When _s_e_t, the bottom
        entry may move off the bottom.
 
-       _7_._4_._1_3_2  _m_e_n_u___s_c_r_o_l_l
+       _7_._4_._1_3_3  _m_e_n_u___s_c_r_o_l_l
 
        Type: boolean
 
@@ -6175,7 +6257,7 @@
        vious page of the menu is displayed (useful for slow links to avoid many
        redraws).
 
-       _7_._4_._1_3_3  _m_e_s_s_a_g_e___f_o_r_m_a_t
+       _7_._4_._1_3_4  _m_e_s_s_a_g_e___f_o_r_m_a_t
 
        Type: string
 
@@ -6183,9 +6265,11 @@
 
        This is the string displayed in the ``attachment'' menu for attachments of type
        message/rfc822.  For a full listing of defined printf(3)-like sequences see the
-       section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113)''.
+       section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114)''.
+
+       The Mutt Next Generation E-Mail Client                                      121
 
-       _7_._4_._1_3_4  _m_e_t_a___k_e_y
+       _7_._4_._1_3_5  _m_e_t_a___k_e_y
 
        Type: boolean
 
@@ -6193,15 +6277,12 @@
 
        If _s_e_t, forces Mutt-ng to interpret keystrokes with the high bit (bit 8) set as
        if the user had pressed the ESC key and whatever key remains after having the
-
-       The Mutt Next Generation E-Mail Client                                      120
-
        high bit removed.  For example, if the key pressed has an ASCII value of 0xf4,
        then this is treated as if the user had pressed ESC then ``x''.  This is
        because the result of removing the high bit from ``0xf4'' is ``0x74'', which is
        the ASCII character ``x''.
 
-       _7_._4_._1_3_5  _m_e_t_o_o
+       _7_._4_._1_3_6  _m_e_t_o_o
 
        Type: boolean
 
@@ -6210,7 +6291,7 @@
        If _u_n_s_e_t, Mutt-ng will remove your address (see the ``alternates'' command)
        from the list of recipients when replying to a message.
 
-       _7_._4_._1_3_6  _m_h___p_u_r_g_e
+       _7_._4_._1_3_7  _m_h___p_u_r_g_e
 
        Type: boolean
 
@@ -6220,7 +6301,7 @@
        _,_<_o_l_d _f_i_l_e _n_a_m_e_> in mh folders instead of really deleting them.  If the vari-
        able is set, the message files will simply be deleted.
 
-       _7_._4_._1_3_7  _m_h___s_e_q___f_l_a_g_g_e_d
+       _7_._4_._1_3_8  _m_h___s_e_q___f_l_a_g_g_e_d
 
        Type: string
 
@@ -6228,7 +6309,7 @@
 
        The name of the MH sequence used for flagged messages.
 
-       _7_._4_._1_3_8  _m_h___s_e_q___r_e_p_l_i_e_d
+       _7_._4_._1_3_9  _m_h___s_e_q___r_e_p_l_i_e_d
 
        Type: string
 
@@ -6236,22 +6317,22 @@
 
        The name of the MH sequence used to tag replied messages.
 
-       _7_._4_._1_3_9  _m_h___s_e_q___u_n_s_e_e_n
+       _7_._4_._1_4_0  _m_h___s_e_q___u_n_s_e_e_n
 
        Type: string
 
        Default: 'unseen'
 
+       The Mutt Next Generation E-Mail Client                                      122
+
        The name of the MH sequence used for unseen messages.
 
-       _7_._4_._1_4_0  _m_i_m_e___f_o_r_w_a_r_d
+       _7_._4_._1_4_1  _m_i_m_e___f_o_r_w_a_r_d
 
        Type: quadoption
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      121
-
        When _s_e_t, the message you are forwarding will be attached as a separate MIME
        part instead of included in the main body of the message.
 
@@ -6259,20 +6340,20 @@
        the message as it was delivered to you. If you like to switch between MIME and
        not MIME from mail to mail, set this variable to ask-no or ask-yes.
 
-       Also see ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.72  , page 104)'' and ``_$_m_i_m_e___f_o_r_-
-       _w_a_r_d___d_e_c_o_d_e (section 7.4.141  , page 121)''.
+       Also see ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.73  , page 105)'' and ``_$_m_i_m_e___f_o_r_-
+       _w_a_r_d___d_e_c_o_d_e (section 7.4.142  , page 122)''.
 
-       _7_._4_._1_4_1  _m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e
+       _7_._4_._1_4_2  _m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e
 
        Type: boolean
 
        Default: no
 
        Controls the decoding of complex MIME messages into text/plain when forwarding
-       a message while ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.140  , page 120)'' is _s_e_t. Other-
-       wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.72  , page 104)'' is used instead.
+       a message while ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.141  , page 121)'' is _s_e_t. Other-
+       wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.73  , page 105)'' is used instead.
 
-       _7_._4_._1_4_2  _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t
+       _7_._4_._1_4_3  _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t
 
        Type: quadoption
 
@@ -6282,7 +6363,7 @@
        menu, attachments which cannot be decoded in a reasonable manner will be
        attached to the newly composed message if this option is set.
 
-       _7_._4_._1_4_3  _m_i_x___e_n_t_r_y___f_o_r_m_a_t
+       _7_._4_._1_4_4  _m_i_x___e_n_t_r_y___f_o_r_m_a_t
 
        Type: string
 
@@ -6299,15 +6380,15 @@
              %c
                    Remailer capabilities.
 
+       The Mutt Next Generation E-Mail Client                                      123
+
              %s
                    The remailer's short name.
 
              %a
                    The remailer's e-mail address.
 
-       The Mutt Next Generation E-Mail Client                                      122
-
-       _7_._4_._1_4_4  _m_i_x_m_a_s_t_e_r
+       _7_._4_._1_4_5  _m_i_x_m_a_s_t_e_r
 
        Type: path
 
@@ -6319,17 +6400,17 @@
        used with various sets of parameters to gather the list of known remailers, and
        to finally send a message through the mixmaster chain.
 
-       _7_._4_._1_4_5  _m_o_v_e
+       _7_._4_._1_4_6  _m_o_v_e
 
        Type: quadoption
 
        Default: ask-no
 
        Controls whether or not Mutt-ng will move read messages from your spool mailbox
-       to your ``_$_m_b_o_x (section 7.4.128  , page 118)'' mailbox, or as a result of a
-       ``_m_b_o_x_-_h_o_o_k (section 3.13  , page 34)'' command.
+       to your ``_$_m_b_o_x (section 7.4.129  , page 119)'' mailbox, or as a result of a
+       ``_m_b_o_x_-_h_o_o_k (section 3.14  , page 35)'' command.
 
-       _7_._4_._1_4_6  _m_s_g_i_d___f_o_r_m_a_t
+       _7_._4_._1_4_7  _m_s_g_i_d___f_o_r_m_a_t
 
        Type: string
 
@@ -6355,6 +6436,8 @@
              %O
                    the current UNIX timestamp (octal)
 
+       The Mutt Next Generation E-Mail Client                                      124
+
              %p
                    the process ID
 
@@ -6362,8 +6445,6 @@
                    the current Message-ID prefix (a character rotating with every Mes-
                    sage-ID being generated)
 
-       The Mutt Next Generation E-Mail Client                                      123
-
              %r
                    a random integer value (decimal)
 
@@ -6388,7 +6469,7 @@
        NNoottee:: Please only change this setting if you know what you are doing.  Also
        make sure to consult RFC2822 to produce technically _v_a_l_i_d strings.
 
-       _7_._4_._1_4_7  _n_a_r_r_o_w___t_r_e_e
+       _7_._4_._1_4_8  _n_a_r_r_o_w___t_r_e_e
 
        Type: boolean
 
@@ -6397,7 +6478,7 @@
        This variable, when _s_e_t, makes the thread tree narrower, allowing deeper
        threads to fit on the screen.
 
-       _7_._4_._1_4_8  _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o
+       _7_._4_._1_4_9  _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o
 
        Type: boolean
 
@@ -6408,10 +6489,12 @@
        If _s_e_t, Mutt-ng will prompt you for the Followup-To: header field before edit-
        ing the body of an outgoing news article.
 
-       _7_._4_._1_4_9  _n_n_t_p___a_s_k___x___c_o_m_m_e_n_t___t_o
+       _7_._4_._1_5_0  _n_n_t_p___a_s_k___x___c_o_m_m_e_n_t___t_o
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      125
+
        Default: no
 
        Availability: NNTP
@@ -6419,9 +6502,7 @@
        If _s_e_t, Mutt-ng will prompt you for the X-Comment-To: header field before edit-
        ing the body of an outgoing news article.
 
-       The Mutt Next Generation E-Mail Client                                      124
-
-       _7_._4_._1_5_0  _n_n_t_p___c_a_c_h_e___d_i_r
+       _7_._4_._1_5_1  _n_n_t_p___c_a_c_h_e___d_i_r
 
        Type: path
 
@@ -6436,7 +6517,7 @@
        As for the header caching in connection with IMAP and/or Maildir, this drasti-
        cally increases speed and lowers traffic.
 
-       _7_._4_._1_5_1  _n_n_t_p___c_a_t_c_h_u_p
+       _7_._4_._1_5_2  _n_n_t_p___c_a_t_c_h_u_p
 
        Type: quadoption
 
@@ -6447,7 +6528,7 @@
        If this variable is _s_e_t, Mutt-ng will mark all articles in a newsgroup as read
        when you leaving it.
 
-       _7_._4_._1_5_2  _n_n_t_p___c_o_n_t_e_x_t
+       _7_._4_._1_5_3  _n_n_t_p___c_o_n_t_e_x_t
 
        Type: number
 
@@ -6456,27 +6537,27 @@
        Availability: NNTP
 
        This variable controls how many news articles to cache per newsgroup (if
-       caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 7.4.150  , page 123)) and how
+       caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 7.4.151  , page 125)) and how
        many news articles to show in the ``index'' menu.
 
-       If there're more articles than defined with _$_n_n_t_p___c_o_n_t_e_x_t (section 7.4.152  ,
-       page 124), all older ones will be removed/not shown in the index.
+       If there're more articles than defined with _$_n_n_t_p___c_o_n_t_e_x_t (section 7.4.153  ,
+       page 125), all older ones will be removed/not shown in the index.
 
-       _7_._4_._1_5_3  _n_n_t_p___f_o_l_l_o_w_u_p___t_o___p_o_s_t_e_r
+       _7_._4_._1_5_4  _n_n_t_p___f_o_l_l_o_w_u_p___t_o___p_o_s_t_e_r
 
        Type: quadoption
 
        Default: ask-yes
 
+       The Mutt Next Generation E-Mail Client                                      126
+
        Availability: NNTP
 
        If this variable is _s_e_t and the keyword 'poster' is present in the Followup-To:
        header field, a follow-up to the newsgroup is not permitted.  The message will
        be mailed to the submitter of the message via mail.
 
-       The Mutt Next Generation E-Mail Client                                      125
-
-       _7_._4_._1_5_4  _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t
+       _7_._4_._1_5_5  _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t
 
        Type: string
 
@@ -6485,8 +6566,8 @@
        Availability: NNTP
 
        This variable allows you to customize the newsgroup browser display to your
-       personal taste.  This string is similar to ``_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  ,
-       page 113)'', but has its own set of printf(3)-like sequences:
+       personal taste.  This string is similar to ``_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  ,
+       page 114)'', but has its own set of printf(3)-like sequences:
 
             %C      current newsgroup number
             %d      description of newsgroup (retrieved from server)
@@ -6498,7 +6579,7 @@
             %>X     right justify the rest of the string and pad with character "X"
             %|X     pad to the end of the line with character "X"
 
-       _7_._4_._1_5_5  _n_n_t_p___h_o_s_t
+       _7_._4_._1_5_6  _n_n_t_p___h_o_s_t
 
        Type: string
 
@@ -6520,7 +6601,9 @@
        security risk since the superuser of your machine may read it regardless of the
        file's permissions.
 
-       _7_._4_._1_5_6  _n_n_t_p___i_n_e_w_s
+       _7_._4_._1_5_7  _n_n_t_p___i_n_e_w_s
+
+       The Mutt Next Generation E-Mail Client                                      127
 
        Type: path
 
@@ -6528,8 +6611,6 @@
 
        Availability: NNTP
 
-       The Mutt Next Generation E-Mail Client                                      126
-
        If _s_e_t, specifies the program and arguments used to deliver news posted by
        Mutt-ng.  Otherwise, Mutt-ng posts article using current connection.  The fol-
        lowing printf(3)-style sequence is understood:
@@ -6538,7 +6619,7 @@
 
        Example: set inews='/usr/local/bin/inews -hS'
 
-       _7_._4_._1_5_7  _n_n_t_p___l_o_a_d___d_e_s_c_r_i_p_t_i_o_n
+       _7_._4_._1_5_8  _n_n_t_p___l_o_a_d___d_e_s_c_r_i_p_t_i_o_n
 
        Type: boolean
 
@@ -6549,7 +6630,7 @@
        This variable controls whether or not descriptions for newsgroups are to be
        loaded when subscribing to a newsgroup.
 
-       _7_._4_._1_5_8  _n_n_t_p___m_a_i_l___c_h_e_c_k
+       _7_._4_._1_5_9  _n_n_t_p___m_a_i_l___c_h_e_c_k
 
        Type: number
 
@@ -6561,7 +6642,7 @@
        article will cause a recheck for new news. If set to 0, Mutt-ng will recheck on
        each operation in index (stepping, read article, etc.).
 
-       _7_._4_._1_5_9  _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t
+       _7_._4_._1_6_0  _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t
 
        Type: boolean
 
@@ -6574,7 +6655,9 @@
 
        NNoottee:: Only change this setting if you know what you are doing.
 
-       _7_._4_._1_6_0  _n_n_t_p___n_e_w_s_r_c
+       _7_._4_._1_6_1  _n_n_t_p___n_e_w_s_r_c
+
+       The Mutt Next Generation E-Mail Client                                      128
 
        Type: path
 
@@ -6582,8 +6665,6 @@
 
        Availability: NNTP
 
-       The Mutt Next Generation E-Mail Client                                      127
-
        This file contains information about subscribed newsgroup and articles read so
        far.
 
@@ -6592,7 +6673,7 @@
 
             %s      newsserver name
 
-       _7_._4_._1_6_1  _n_n_t_p___p_a_s_s
+       _7_._4_._1_6_2  _n_n_t_p___p_a_s_s
 
        Type: string
 
@@ -6605,7 +6686,7 @@
        NNoottee:: Storing passwords in a configuration file presents a security risk since
        the superuser of your machine may read it regardless of the file's permissions.
 
-       _7_._4_._1_6_2  _n_n_t_p___p_o_s_t___m_o_d_e_r_a_t_e_d
+       _7_._4_._1_6_3  _n_n_t_p___p_o_s_t___m_o_d_e_r_a_t_e_d
 
        Type: quadoption
 
@@ -6619,7 +6700,7 @@
        NNoottee:: if the newsserver does not support posting to that newsgroup or a group
        is totally read-only, that posting will not have any effect.
 
-       _7_._4_._1_6_3  _n_n_t_p___r_e_c_o_n_n_e_c_t
+       _7_._4_._1_6_4  _n_n_t_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
 
@@ -6630,20 +6711,20 @@
        Controls whether or not Mutt-ng will try to reconnect to a newsserver when the
        was connection lost.
 
-       _7_._4_._1_6_4  _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d
+       The Mutt Next Generation E-Mail Client                                      129
+
+       _7_._4_._1_6_5  _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      128
-
        Availability: NNTP
 
        When _s_e_t, info about unsubscribed newsgroups will be saved into the ``newsrc''
        file and into the news cache.
 
-       _7_._4_._1_6_5  _n_n_t_p___s_h_o_w___n_e_w___n_e_w_s
+       _7_._4_._1_6_6  _n_n_t_p___s_h_o_w___n_e_w___n_e_w_s
 
        Type: boolean
 
@@ -6656,7 +6737,7 @@
        whether or not the number of new articles of subscribed newsgroups will be
        checked.
 
-       _7_._4_._1_6_6  _n_n_t_p___s_h_o_w___o_n_l_y___u_n_r_e_a_d
+       _7_._4_._1_6_7  _n_n_t_p___s_h_o_w___o_n_l_y___u_n_r_e_a_d
 
        Type: boolean
 
@@ -6667,7 +6748,7 @@
        If _s_e_t, only subscribed newsgroups that contain unread articles will be dis-
        played in the newsgroup browser.
 
-       _7_._4_._1_6_7  _n_n_t_p___u_s_e_r
+       _7_._4_._1_6_8  _n_n_t_p___u_s_e_r
 
        Type: string
 
@@ -6678,7 +6759,7 @@
        Your login name on the NNTP server.  If _u_n_s_e_t and the server requires authen-
        tification, Mutt-ng will prompt you for your account name.
 
-       _7_._4_._1_6_8  _n_n_t_p___x___c_o_m_m_e_n_t___t_o
+       _7_._4_._1_6_9  _n_n_t_p___x___c_o_m_m_e_n_t___t_o
 
        Type: boolean
 
@@ -6686,15 +6767,15 @@
 
        Availability: NNTP
 
+       The Mutt Next Generation E-Mail Client                                      130
+
        If _s_e_t, Mutt-ng will add a ``X-Comment-To:'' header field (that contains full
        name of the original article author) to articles that you followup to.
 
-       _7_._4_._1_6_9  _o_p_e_r_a_t_i_n_g___s_y_s_t_e_m
+       _7_._4_._1_7_0  _o_p_e_r_a_t_i_n_g___s_y_s_t_e_m
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      129
-
        Default: ''
 
        This specifies the operating system name for the User-Agent: header field. If
@@ -6703,7 +6784,7 @@
 
        It may, for example, look as: ``mutt-ng 1.5.9i (Linux)''.
 
-       _7_._4_._1_7_0  _p_a_g_e_r
+       _7_._4_._1_7_1  _p_a_g_e_r
 
        Type: path
 
@@ -6718,7 +6799,7 @@
        screen resizes cause lines longer than the screen width to be badly formatted
        in the help menu.
 
-       _7_._4_._1_7_1  _p_a_g_e_r___c_o_n_t_e_x_t
+       _7_._4_._1_7_2  _p_a_g_e_r___c_o_n_t_e_x_t
 
        Type: number
 
@@ -6729,7 +6810,7 @@
        will display the line after the last one on the screen at the top of the next
        page (0 lines of context).
 
-       _7_._4_._1_7_2  _p_a_g_e_r___f_o_r_m_a_t
+       _7_._4_._1_7_3  _p_a_g_e_r___f_o_r_m_a_t
 
        Type: string
 
@@ -6737,10 +6818,12 @@
 
        This variable controls the format of the one-line message ``status'' displayed
        before each message in either the internal or an external pager.  The valid
-       sequences are listed in the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113)''
+       sequences are listed in the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114)''
        section.
 
-       _7_._4_._1_7_3  _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
+       _7_._4_._1_7_4  _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
+
+       The Mutt Next Generation E-Mail Client                                      131
 
        Type: number
 
@@ -6749,9 +6832,6 @@
        Determines the number of lines of a mini-index which is shown when in the
        pager.  The current message, unless near the top or bottom of the folder, will
        be roughly one third of the way down this mini-index, giving the reader the
-
-       The Mutt Next Generation E-Mail Client                                      130
-
        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.  One of the lines is reserved for the status bar from the index, so a
@@ -6760,7 +6840,7 @@
        folder is less than _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s, then the index will only use as many
        lines as it needs.
 
-       _7_._4_._1_7_4  _p_a_g_e_r___s_t_o_p
+       _7_._4_._1_7_5  _p_a_g_e_r___s_t_o_p
 
        Type: boolean
 
@@ -6769,7 +6849,7 @@
        When _s_e_t, the internal-pager will nnoott move to the next message when you are at
        the end of a message and invoke the _n_e_x_t_-_p_a_g_e function.
 
-       _7_._4_._1_7_5  _p_g_p___a_u_t_o___d_e_c_o_d_e
+       _7_._4_._1_7_6  _p_g_p___a_u_t_o___d_e_c_o_d_e
 
        Type: boolean
 
@@ -6782,7 +6862,7 @@
        ditional-pgp function, Mutt-ng will automatically check the message for tradi-
        tional pgp.
 
-       _7_._4_._1_7_6  _p_g_p___a_u_t_o_i_n_l_i_n_e
+       _7_._4_._1_7_7  _p_g_p___a_u_t_o_i_n_l_i_n_e
 
        Type: boolean
 
@@ -6795,23 +6875,23 @@
        Note that Mutt-ng might automatically use PGP/MIME for messages which consist
        of more than a single MIME part.  Mutt-ng can be configured to ask before send-
        ing PGP/MIME messages when inline (traditional) would not work.  See also:
-       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.192  , page 134)''.
+       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.193  , page 135)''.
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       _7_._4_._1_7_7  _p_g_p___c_h_e_c_k___e_x_i_t
+       The Mutt Next Generation E-Mail Client                                      132
+
+       _7_._4_._1_7_8  _p_g_p___c_h_e_c_k___e_x_i_t
 
        Type: boolean
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      131
-
        If _s_e_t, Mutt-ng will check the exit code of the PGP subprocess when signing or
        encrypting.  A non-zero exit code means that the subprocess failed.  (PGP only)
 
-       _7_._4_._1_7_8  _p_g_p___c_l_e_a_r_s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._1_7_9  _p_g_p___c_l_e_a_r_s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6821,7 +6901,7 @@
 
        Note that the use of this format is ssttrroonnggllyy ddeepprreeccaatteedd.  (PGP only)
 
-       _7_._4_._1_7_9  _p_g_p___d_e_c_o_d_e___c_o_m_m_a_n_d
+       _7_._4_._1_8_0  _p_g_p___d_e_c_o_d_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6844,7 +6924,7 @@
                    multipart/signed attachment when verifying it.
 
              %a
-                   The value of _$_p_g_p___s_i_g_n___a_s (section 7.4.196  , page 135).
+                   The value of _$_p_g_p___s_i_g_n___a_s (section 7.4.197  , page 136).
 
              %r
                    One or more key IDs.
@@ -6854,7 +6934,9 @@
        subdirectory which has been installed on your system alongside the documenta-
        tion.  (PGP only)
 
-       _7_._4_._1_8_0  _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._1_8_1  _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d
+
+       The Mutt Next Generation E-Mail Client                                      133
 
        Type: string
 
@@ -6862,9 +6944,7 @@
 
        This command is used to decrypt a PGP encrypted message.  (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      132
-
-       _7_._4_._1_8_1  _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d
+       _7_._4_._1_8_2  _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6872,7 +6952,7 @@
 
        This command is used to encrypt a body part without signing it.  (PGP only)
 
-       _7_._4_._1_8_2  _p_g_p___e_n_c_r_y_p_t___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._1_8_3  _p_g_p___e_n_c_r_y_p_t___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6880,15 +6960,15 @@
 
        This command is used to both sign and encrypt a body part.  (PGP only)
 
-       _7_._4_._1_8_3  _p_g_p___e_n_t_r_y___f_o_r_m_a_t
+       _7_._4_._1_8_4  _p_g_p___e_n_t_r_y___f_o_r_m_a_t
 
        Type: string
 
        Default: '%4n %t%f %4l/0x%k %-4a %2c %u'
 
        This variable allows you to customize the PGP key selection menu to your per-
-       sonal taste. This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page
-       113)'', but has its own set of printf(3)-like sequences:
+       sonal taste. This string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page
+       114)'', but has its own set of printf(3)-like sequences:
 
              %n
                    number
@@ -6911,6 +6991,8 @@
              %c
                    capabilities
 
+       The Mutt Next Generation E-Mail Client                                      134
+
              %t
                    trust/validity of the key-uid association
 
@@ -6919,9 +7001,7 @@
 
        (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      133
-
-       _7_._4_._1_8_4  _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d
+       _7_._4_._1_8_5  _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6930,7 +7010,7 @@
        This command is used to export a public key from the user's key ring.  (PGP
        only)
 
-       _7_._4_._1_8_5  _p_g_p___g_e_t_k_e_y_s___c_o_m_m_a_n_d
+       _7_._4_._1_8_6  _p_g_p___g_e_t_k_e_y_s___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6939,18 +7019,18 @@
        This command is invoked whenever Mutt-ng will need public key information.  %r
        is the only printf(3)-like sequence used with this format.  (PGP only)
 
-       _7_._4_._1_8_6  _p_g_p___g_o_o_d___s_i_g_n
+       _7_._4_._1_8_7  _p_g_p___g_o_o_d___s_i_g_n
 
        Type: regular expression
 
        Default: ''
 
        If you assign a text to this variable, then a PGP signature is only considered
-       verified if the output from _$_p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d (section 7.4.202  , page 136)
+       verified if the output from _$_p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d (section 7.4.203  , page 137)
        contains the text. Use this variable if the exit code from the command is 0
        even for bad signatures.  (PGP only)
 
-       _7_._4_._1_8_7  _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s
+       _7_._4_._1_8_8  _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s
 
        Type: boolean
 
@@ -6960,30 +7040,31 @@
        the principal key will inherit the subkeys' capabilities. _U_n_s_e_t this if you
        want to play interesting key selection games.  (PGP only)
 
-       _7_._4_._1_8_8  _p_g_p___i_m_p_o_r_t___c_o_m_m_a_n_d
+       _7_._4_._1_8_9  _p_g_p___i_m_p_o_r_t___c_o_m_m_a_n_d
 
        Type: string
 
        Default: ''
 
        This command is used to import a key from a message into the user's public key
+
+       The Mutt Next Generation E-Mail Client                                      135
+
        ring.  (PGP only)
 
-       _7_._4_._1_8_9  _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d
+       _7_._4_._1_9_0  _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d
 
        Type: string
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      134
-
        This command is used to list the public key ring's contents.  The output format
        must be analogous to the one used by gpg --list-keys --with-colons.
 
        This format is also generated by the pgpring utility which comes with Mutt-ng.
        (PGP only)
 
-       _7_._4_._1_9_0  _p_g_p___l_i_s_t___s_e_c_r_i_n_g___c_o_m_m_a_n_d
+       _7_._4_._1_9_1  _p_g_p___l_i_s_t___s_e_c_r_i_n_g___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6995,7 +7076,7 @@
        This format is also generated by the pgpring utility which comes with Mutt-ng.
        (PGP only)
 
-       _7_._4_._1_9_1  _p_g_p___l_o_n_g___i_d_s
+       _7_._4_._1_9_2  _p_g_p___l_o_n_g___i_d_s
 
        Type: boolean
 
@@ -7004,7 +7085,7 @@
        If _s_e_t, use 64 bit PGP key IDs. _U_n_s_e_t uses the normal 32 bit Key IDs.  (PGP
        only)
 
-       _7_._4_._1_9_2  _p_g_p___m_i_m_e___a_u_t_o
+       _7_._4_._1_9_3  _p_g_p___m_i_m_e___a_u_t_o
 
        Type: quadoption
 
@@ -7017,12 +7098,14 @@
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       _7_._4_._1_9_3  _p_g_p___r_e_p_l_y_i_n_l_i_n_e
+       _7_._4_._1_9_4  _p_g_p___r_e_p_l_y_i_n_l_i_n_e
 
        Type: boolean
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      136
+
        Setting this variable will cause Mutt-ng to always attempt to create an inline
        (traditional) message when replying to a message which is PGP encrypted/signed
        inline.  This can be overridden by use of the _p_g_p_-_m_e_n_u, when inline is not
@@ -7031,17 +7114,14 @@
        checked/flagged messages.
 
        Note that Mutt-ng might automatically use PGP/MIME for messages which consist
-
-       The Mutt Next Generation E-Mail Client                                      135
-
        of more than a single MIME part.  Mutt-ng can be configured to ask before send-
        ing PGP/MIME messages when inline (traditional) would not work.  See also:
-       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.192  , page 134)''.
+       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.193  , page 135)''.
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       _7_._4_._1_9_4  _p_g_p___r_e_t_a_i_n_a_b_l_e___s_i_g_s
+       _7_._4_._1_9_5  _p_g_p___r_e_t_a_i_n_a_b_l_e___s_i_g_s
 
        Type: boolean
 
@@ -7054,7 +7134,7 @@
        the outer layer (multipart/encrypted) can be easily removed, while the inner
        multipart/signed part is retained.  (PGP only)
 
-       _7_._4_._1_9_5  _p_g_p___s_h_o_w___u_n_u_s_a_b_l_e
+       _7_._4_._1_9_6  _p_g_p___s_h_o_w___u_n_u_s_a_b_l_e
 
        Type: boolean
 
@@ -7064,7 +7144,7 @@
        This includes keys which have been revoked, have expired, or have been marked
        as ``disabled'' by the user.  (PGP only)
 
-       _7_._4_._1_9_6  _p_g_p___s_i_g_n___a_s
+       _7_._4_._1_9_7  _p_g_p___s_i_g_n___a_s
 
        Type: string
 
@@ -7074,23 +7154,23 @@
        your private keys to use.  It is recommended that you use the keyid form to
        specify your key (e.g., ``0x00112233'').  (PGP only)
 
-       _7_._4_._1_9_7  _p_g_p___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._1_9_8  _p_g_p___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
        Default: ''
 
+       The Mutt Next Generation E-Mail Client                                      137
+
        This command is used to create the detached PGP signature for a multi-
        part/signed PGP/MIME body part.  (PGP only)
 
-       _7_._4_._1_9_8  _p_g_p___s_o_r_t___k_e_y_s
+       _7_._4_._1_9_9  _p_g_p___s_o_r_t___k_e_y_s
 
        Type: sort order
 
        Default: address
 
-       The Mutt Next Generation E-Mail Client                                      136
-
        Specifies how the entries in the ``pgp keys'' menu are sorted. The following
        are legal values:
 
@@ -7109,7 +7189,7 @@
        If you prefer reverse order of the above values, prefix it with ``reverse-''.
        (PGP only)
 
-       _7_._4_._1_9_9  _p_g_p___s_t_r_i_c_t___e_n_c
+       _7_._4_._2_0_0  _p_g_p___s_t_r_i_c_t___e_n_c
 
        Type: boolean
 
@@ -7120,7 +7200,7 @@
        non-verifyable PGP signatures, so only change this if you know what you are
        doing.  (PGP only)
 
-       _7_._4_._2_0_0  _p_g_p___t_i_m_e_o_u_t
+       _7_._4_._2_0_1  _p_g_p___t_i_m_e_o_u_t
 
        Type: number
 
@@ -7129,7 +7209,7 @@
        The number of seconds after which a cached passphrase will expire if not used.
        Default: 300.  (PGP only)
 
-       _7_._4_._2_0_1  _p_g_p___u_s_e___g_p_g___a_g_e_n_t
+       _7_._4_._2_0_2  _p_g_p___u_s_e___g_p_g___a_g_e_n_t
 
        Type: boolean
 
@@ -7137,7 +7217,9 @@
 
        If _s_e_t, Mutt-ng will use a possibly-running gpg-agent process.  (PGP only)
 
-       _7_._4_._2_0_2  _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d
+       The Mutt Next Generation E-Mail Client                                      138
+
+       _7_._4_._2_0_3  _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7145,9 +7227,7 @@
 
        This command is used to verify PGP signatures.  (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      137
-
-       _7_._4_._2_0_3  _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d
+       _7_._4_._2_0_4  _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7156,7 +7236,7 @@
        This command is used to verify key information from the key selection menu.
        (PGP only)
 
-       _7_._4_._2_0_4  _p_i_p_e___d_e_c_o_d_e
+       _7_._4_._2_0_5  _p_i_p_e___d_e_c_o_d_e
 
        Type: boolean
 
@@ -7166,7 +7246,7 @@
        pipe the messages without any preprocessing. When _s_e_t, Mutt-ng will weed head-
        ers and will attempt to PGP/MIME decode the messages first.
 
-       _7_._4_._2_0_5  _p_i_p_e___s_e_p
+       _7_._4_._2_0_6  _p_i_p_e___s_e_p
 
        Type: string
 
@@ -7175,7 +7255,7 @@
        The separator to add between messages when piping a list of tagged messages to
        an external Unix command.
 
-       _7_._4_._2_0_6  _p_i_p_e___s_p_l_i_t
+       _7_._4_._2_0_7  _p_i_p_e___s_p_l_i_t
 
        Type: boolean
 
@@ -7186,14 +7266,16 @@
        of tagged messages Mutt-ng will concatenate the messages and will pipe them as
        a single folder.  When _s_e_t, Mutt-ng will pipe the messages one by one.  In both
        cases the messages are piped in the current sorted order, and the ``_$_p_i_p_e___s_e_p
-       (section 7.4.205  , page 137)'' separator is added after each message.
+       (section 7.4.206  , page 138)'' separator is added after each message.
 
-       _7_._4_._2_0_7  _p_o_p___a_u_t_h___t_r_y___a_l_l
+       _7_._4_._2_0_8  _p_o_p___a_u_t_h___t_r_y___a_l_l
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      139
+
        Availability: POP
 
        If _s_e_t, Mutt-ng will try all available methods. When _u_n_s_e_t, Mutt-ng will only
@@ -7201,9 +7283,7 @@
        able. If a method is available but authentication fails, Mutt-ng will not con-
        nect to the POP server.
 
-       The Mutt Next Generation E-Mail Client                                      138
-
-       _7_._4_._2_0_8  _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
+       _7_._4_._2_0_9  _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
 
        Type: string
 
@@ -7222,7 +7302,7 @@
 
        Example: set pop_authenticators='digest-md5:apop:user'
 
-       _7_._4_._2_0_9  _p_o_p___d_e_l_e_t_e
+       _7_._4_._2_1_0  _p_o_p___d_e_l_e_t_e
 
        Type: quadoption
 
@@ -7234,7 +7314,7 @@
        server when using the ``fetch-mail'' function.  When _u_n_s_e_t, Mutt-ng will down-
        load messages but also leave them on the POP server.
 
-       _7_._4_._2_1_0  _p_o_p___h_o_s_t
+       _7_._4_._2_1_1  _p_o_p___h_o_s_t
 
        Type: string
 
@@ -7250,7 +7330,9 @@
        NNoottee:: Storing passwords in a configuration file presents a security risk since
        the superuser of your machine may read it regardless of the file's permissions.
 
-       _7_._4_._2_1_1  _p_o_p___l_a_s_t
+       The Mutt Next Generation E-Mail Client                                      140
+
+       _7_._4_._2_1_2  _p_o_p___l_a_s_t
 
        Type: boolean
 
@@ -7258,13 +7340,11 @@
 
        Availability: POP
 
-       The Mutt Next Generation E-Mail Client                                      139
-
        If this variable is _s_e_t, Mutt-ng will try to use the ``LAST'' POP command for
        retrieving only unread messages from the POP server when using the ``fetch-
        mail'' function.
 
-       _7_._4_._2_1_2  _p_o_p___m_a_i_l___c_h_e_c_k
+       _7_._4_._2_1_3  _p_o_p___m_a_i_l___c_h_e_c_k
 
        Type: number
 
@@ -7274,7 +7354,7 @@
 
        This variable configures how often (in seconds) POP should look for new mail.
 
-       _7_._4_._2_1_3  _p_o_p___p_a_s_s
+       _7_._4_._2_1_4  _p_o_p___p_a_s_s
 
        Type: string
 
@@ -7288,7 +7368,7 @@
        NNoottee:: Storing passwords in a configuration file presents a security risk since
        the superuser of your machine may read it regardless of the file's permissions.
 
-       _7_._4_._2_1_4  _p_o_p___r_e_c_o_n_n_e_c_t
+       _7_._4_._2_1_5  _p_o_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
 
@@ -7299,7 +7379,7 @@
        Controls whether or not Mutt-ng will try to reconnect to a POP server when the
        connection is lost.
 
-       _7_._4_._2_1_5  _p_o_p___u_s_e_r
+       _7_._4_._2_1_6  _p_o_p___u_s_e_r
 
        Type: string
 
@@ -7307,43 +7387,43 @@
 
        Availability: POP
 
+       The Mutt Next Generation E-Mail Client                                      141
+
        Your login name on the POP server.
 
        This variable defaults to your user name on the local machine.
 
-       _7_._4_._2_1_6  _p_o_s_t___i_n_d_e_n_t___s_t_r_i_n_g
+       _7_._4_._2_1_7  _p_o_s_t___i_n_d_e_n_t___s_t_r_i_n_g
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      140
-
        Default: ''
 
-       Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 7.4.17  , page 91)'' variable, Mutt-ng
+       Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 7.4.18  , page 92)'' variable, Mutt-ng
        will append this string after the inclusion of a message which is being replied
        to.
 
-       _7_._4_._2_1_7  _p_o_s_t_p_o_n_e
+       _7_._4_._2_1_8  _p_o_s_t_p_o_n_e
 
        Type: quadoption
 
        Default: ask-yes
 
        Controls whether or not messages are saved in the ``_$_p_o_s_t_p_o_n_e_d (section
-       7.4.218  , page 140)'' mailbox when you elect not to send immediately.
+       7.4.219  , page 141)'' mailbox when you elect not to send immediately.
 
-       _7_._4_._2_1_8  _p_o_s_t_p_o_n_e_d
+       _7_._4_._2_1_9  _p_o_s_t_p_o_n_e_d
 
        Type: path
 
        Default: '~/postponed'
 
-       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 7.4.217  , page 139)
+       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 7.4.218  , page 141)
        sending a message'' which you are editing.  When you choose to postpone a mes-
        sage, Mutt-ng saves it in the mailbox specified by this variable.  Also see the
-       ``_$_p_o_s_t_p_o_n_e (section 7.4.217  , page 139)'' variable.
+       ``_$_p_o_s_t_p_o_n_e (section 7.4.218  , page 141)'' variable.
 
-       _7_._4_._2_1_9  _p_r_e_c_o_n_n_e_c_t
+       _7_._4_._2_2_0  _p_r_e_c_o_n_n_e_c_t
 
        Type: string
 
@@ -7362,7 +7442,9 @@
        NNoottee:: For this example to work, you must be able to log in to the remote
        machine without having to enter a password.
 
-       _7_._4_._2_2_0  _p_r_i_n_t
+       The Mutt Next Generation E-Mail Client                                      142
+
+       _7_._4_._2_2_1  _p_r_i_n_t
 
        Type: quadoption
 
@@ -7371,9 +7453,7 @@
        Controls whether or not Mutt-ng really prints messages.  This is set to _a_s_k_-_n_o
        by default, because some people accidentally hit ``p'' often.
 
-       The Mutt Next Generation E-Mail Client                                      141
-
-       _7_._4_._2_2_1  _p_r_i_n_t___c_o_m_m_a_n_d
+       _7_._4_._2_2_2  _p_r_i_n_t___c_o_m_m_a_n_d
 
        Type: path
 
@@ -7381,7 +7461,7 @@
 
        This specifies the command pipe that should be used to print messages.
 
-       _7_._4_._2_2_2  _p_r_i_n_t___d_e_c_o_d_e
+       _7_._4_._2_2_3  _p_r_i_n_t___d_e_c_o_d_e
 
        Type: boolean
 
@@ -7389,52 +7469,53 @@
 
        Used in connection with the print-message command.  If this option is _s_e_t, the
        message is decoded before it is passed to the external command specified by
-       _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.221  , page 140).  If this option is _u_n_s_e_t, no pro-
+       _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.222  , page 142).  If this option is _u_n_s_e_t, no pro-
        cessing will be applied to the message when printing it.  The latter setting
        may be useful if you are using some advanced printer filter which is able to
        properly format e-mail messages for printing.
 
-       _7_._4_._2_2_3  _p_r_i_n_t___s_p_l_i_t
+       _7_._4_._2_2_4  _p_r_i_n_t___s_p_l_i_t
 
        Type: boolean
 
        Default: no
 
        Used in connection with the print-message command.  If this option is _s_e_t, the
-       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.221  , page 140) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.222  , page 142) is executed
        once for each message which is to be printed.  If this option is _u_n_s_e_t, the
-       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.221  , page 140) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.222  , page 142) is executed
        only once, and all the messages are concatenated, with a form feed as the mes-
        sage separator.
 
        Those who use the enscript(1) program's mail-printing mode will most likely
        want to set this option.
 
-       _7_._4_._2_2_4  _p_r_o_m_p_t___a_f_t_e_r
+       _7_._4_._2_2_5  _p_r_o_m_p_t___a_f_t_e_r
 
        Type: boolean
 
        Default: yes
 
-       If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 7.4.170  , page 129)'', setting this
+       If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 7.4.171  , page 130)'', setting this
        variable will cause Mutt-ng to prompt you for a command when the pager exits
+
+       The Mutt Next Generation E-Mail Client                                      143
+
        rather than returning to the index menu.  If _u_n_s_e_t, Mutt-ng will return to the
        index menu when the external pager exits.
 
-       _7_._4_._2_2_5  _q_u_e_r_y___c_o_m_m_a_n_d
+       _7_._4_._2_2_6  _q_u_e_r_y___c_o_m_m_a_n_d
 
        Type: path
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      142
-
        This specifies the command that Mutt-ng will use to make external address
        queries.  The string should contain a %s, which will be substituted with the
-       query string the user types.  See ``_q_u_e_r_y (section 4.7  , page 56)'' for more
+       query string the user types.  See ``_q_u_e_r_y (section 4.7  , page 57)'' for more
        information.
 
-       _7_._4_._2_2_6  _q_u_i_t
+       _7_._4_._2_2_7  _q_u_i_t
 
        Type: quadoption
 
@@ -7445,16 +7526,16 @@
        and if it is set to _a_s_k_-_y_e_s or _a_s_k_-_n_o, you are prompted for confirmation when
        you try to quit.
 
-       _7_._4_._2_2_7  _q_u_o_t_e___e_m_p_t_y
+       _7_._4_._2_2_8  _q_u_o_t_e___e_m_p_t_y
 
        Type: boolean
 
        Default: yes
 
        Controls whether or not empty lines will be quoted using ``_i_n_d_e_n_t___s_t_r_i_n_g (sec-
-       tion 7.4.112  , page 113)''.
+       tion 7.4.113  , page 114)''.
 
-       _7_._4_._2_2_8  _q_u_o_t_e___q_u_o_t_e_d
+       _7_._4_._2_2_9  _q_u_o_t_e___q_u_o_t_e_d
 
        Type: boolean
 
@@ -7462,9 +7543,9 @@
 
        Controls how quoted lines will be quoted. If _s_e_t, one quote character will be
        added to the end of existing prefix.  Otherwise, quoted lines will be prepended
-       by ``_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.112  , page 113)''.
+       by ``_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.113  , page 114)''.
 
-       _7_._4_._2_2_9  _q_u_o_t_e___r_e_g_e_x_p
+       _7_._4_._2_3_0  _q_u_o_t_e___r_e_g_e_x_p
 
        Type: regular expression
 
@@ -7474,17 +7555,18 @@
        text in the body of a message.
 
        NNoottee:: In order to use the _q_u_o_t_e_dxx patterns in the internal pager, you need to
+
+       The Mutt Next Generation E-Mail Client                                      144
+
        set this to a regular expression that matches _e_x_a_c_t_l_y the quote characters at
        the beginning of quoted lines.
 
-       _7_._4_._2_3_0  _r_e_a_d___i_n_c
+       _7_._4_._2_3_1  _r_e_a_d___i_n_c
 
        Type: number
 
        Default: 10
 
-       The Mutt Next Generation E-Mail Client                                      143
-
        If set to a value greater than 0, Mutt-ng will display which message it is cur-
        rently on when reading a mailbox.  The message is printed after _r_e_a_d___i_n_c mes-
        sages have been read (e.g., if set to 25, Mutt-ng will print a message when it
@@ -7493,9 +7575,9 @@
        time.  When set to 0, only a single message will appear before the reading the
        mailbox.
 
-       Also see the ``_$_w_r_i_t_e___i_n_c (section 7.4.344  , page 170)'' variable.
+       Also see the ``_$_w_r_i_t_e___i_n_c (section 7.4.344  , page 171)'' variable.
 
-       _7_._4_._2_3_1  _r_e_a_d___o_n_l_y
+       _7_._4_._2_3_2  _r_e_a_d___o_n_l_y
 
        Type: boolean
 
@@ -7503,7 +7585,7 @@
 
        If set, all folders are opened in read-only mode.
 
-       _7_._4_._2_3_2  _r_e_a_l_n_a_m_e
+       _7_._4_._2_3_3  _r_e_a_l_n_a_m_e
 
        Type: string
 
@@ -7515,20 +7597,22 @@
        By default, this is the GECOS field from /etc/passwd.
 
        _N_o_t_e_: This variable will _n_o_t be used when the user has set a real name in the
-       _$_f_r_o_m (section 7.4.77  , page 105) variable.
+       _$_f_r_o_m (section 7.4.78  , page 106) variable.
 
-       _7_._4_._2_3_3  _r_e_c_a_l_l
+       _7_._4_._2_3_4  _r_e_c_a_l_l
 
        Type: quadoption
 
        Default: ask-yes
 
        Controls whether or not Mutt-ng recalls postponed messages when composing a new
-       message.  Also see ``_$_p_o_s_t_p_o_n_e_d (section 7.4.218  , page 140)''.
+       message.  Also see ``_$_p_o_s_t_p_o_n_e_d (section 7.4.219  , page 141)''.
 
        Setting this variable to _y_e_s is not generally useful, and thus not recommended.
 
-       _7_._4_._2_3_4  _r_e_c_o_r_d
+       _7_._4_._2_3_5  _r_e_c_o_r_d
+
+       The Mutt Next Generation E-Mail Client                                      145
 
        Type: path
 
@@ -7536,17 +7620,15 @@
 
        This specifies the file into which your outgoing messages should be appended.
        (This is meant as the primary method for saving a copy of your messages, but
-       another way to do this is using the ``_m_y___h_d_r (section 3.15  , page 35)'' com-
+       another way to do this is using the ``_m_y___h_d_r (section 3.16  , page 36)'' com-
        mand to create a Bcc: header field with your email address in it.)
 
-       The Mutt Next Generation E-Mail Client                                      144
-
-       The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _7_._4_._2_3_4  _, _p_a_g_e _1_4_3_) is overridden by the
-       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.71  , page 103)'' and ``_$_s_a_v_e___n_a_m_e (section
-       7.4.245  , page 146)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18  , page
-       36)'' command.
+       The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _7_._4_._2_3_5  _, _p_a_g_e _1_4_4_) is overridden by the
+       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.72  , page 105)'' and ``_$_s_a_v_e___n_a_m_e (section
+       7.4.246  , page 147)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.19  , page
+       38)'' command.
 
-       _7_._4_._2_3_5  _r_e_p_l_y___r_e_g_e_x_p
+       _7_._4_._2_3_6  _r_e_p_l_y___r_e_g_e_x_p
 
        Type: regular expression
 
@@ -7556,7 +7638,7 @@
        ing. The default value corresponds to the English ``Re:'' and the German
        ``Aw:''.
 
-       _7_._4_._2_3_6  _r_e_p_l_y___s_e_l_f
+       _7_._4_._2_3_7  _r_e_p_l_y___s_e_l_f
 
        Type: boolean
 
@@ -7566,7 +7648,7 @@
        that you want to reply to the recipients of that message rather than to your-
        self.
 
-       _7_._4_._2_3_7  _r_e_p_l_y___t_o
+       _7_._4_._2_3_8  _r_e_p_l_y___t_o
 
        Type: quadoption
 
@@ -7580,24 +7662,24 @@
        header field to the list address and you want to send a private message to the
        author of a message.
 
-       _7_._4_._2_3_8  _r_e_s_o_l_v_e
+       _7_._4_._2_3_9  _r_e_s_o_l_v_e
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      146
+
        When set, the cursor will be automatically advanced to the next (possibly
        undeleted) message whenever a command that modifies the current message is exe-
        cuted.
 
-       _7_._4_._2_3_9  _r_e_v_e_r_s_e___a_l_i_a_s
+       _7_._4_._2_4_0  _r_e_v_e_r_s_e___a_l_i_a_s
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      145
-
        This variable controls whether or not Mutt-ng will display the ``personal''
        name from your aliases in the index menu if it finds an alias that matches the
        message's sender.  For example, if you have the following alias:
@@ -7612,7 +7694,7 @@
        ``abd30425@somewhere.net.''  This is useful when the person's e-mail address is
        not human friendly (like CompuServe addresses).
 
-       _7_._4_._2_4_0  _r_e_v_e_r_s_e___n_a_m_e
+       _7_._4_._2_4_1  _r_e_v_e_r_s_e___n_a_m_e
 
        Type: boolean
 
@@ -7626,22 +7708,24 @@
        would be used doesn't match your alternates, the From: line will use your
        address on the current machine.
 
-       _7_._4_._2_4_1  _r_e_v_e_r_s_e___r_e_a_l_n_a_m_e
+       _7_._4_._2_4_2  _r_e_v_e_r_s_e___r_e_a_l_n_a_m_e
 
        Type: boolean
 
        Default: yes
 
-       This variable fine-tunes the behaviour of the _r_e_v_e_r_s_e___n_a_m_e (section 7.4.240  ,
-       page 145) feature.  When it is _s_e_t, Mutt-ng will use the address from incoming
+       This variable fine-tunes the behaviour of the _r_e_v_e_r_s_e___n_a_m_e (section 7.4.241  ,
+       page 146) feature.  When it is _s_e_t, Mutt-ng will use the address from incoming
        messages as-is, possibly including eventual real names.  When it is _u_n_s_e_t,
        Mutt-ng will override any such real names with the setting of the _r_e_a_l_n_a_m_e
-       (section 7.4.232  , page 143) variable.
+       (section 7.4.233  , page 144) variable.
 
-       _7_._4_._2_4_2  _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s
+       _7_._4_._2_4_3  _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      147
+
        Default: no
 
        When this variable is _s_e_t, Mutt-ng will decode RFC-2047-encoded MIME parame-
@@ -7653,8 +7737,6 @@
        When this variable is _s_e_t interactively, the change doesn't have the desired
        effect before you have changed folders.
 
-       The Mutt Next Generation E-Mail Client                                      146
-
        Note that this use of RFC 2047's encoding is explicitly, prohibited by the
        standard, but nevertheless encountered in the wild.
 
@@ -7662,31 +7744,31 @@
        _g_e_n_e_r_a_t_e_s this kind of encoding.  Instead, Mutt-ng will unconditionally use the
        encoding specified in RFC 2231.
 
-       _7_._4_._2_4_3  _s_a_v_e___a_d_d_r_e_s_s
+       _7_._4_._2_4_4  _s_a_v_e___a_d_d_r_e_s_s
 
        Type: boolean
 
        Default: no
 
        If _s_e_t, Mutt-ng will take the sender's full address when choosing a default
-       folder for saving a mail. If ``_$_s_a_v_e___n_a_m_e (section 7.4.245  , page 146)'' or
-       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.71  , page 103)'' is _s_e_t too, the selection of the
+       folder for saving a mail. If ``_$_s_a_v_e___n_a_m_e (section 7.4.246  , page 147)'' or
+       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.72  , page 105)'' is _s_e_t too, the selection of the
        fcc folder will be changed as well.
 
-       _7_._4_._2_4_4  _s_a_v_e___e_m_p_t_y
+       _7_._4_._2_4_5  _s_a_v_e___e_m_p_t_y
 
        Type: boolean
 
        Default: yes
 
        When _u_n_s_e_t, mailboxes which contain no saved messages will be removed when
-       closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 7.4.301  , page 159)'' which is
+       closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 7.4.302  , page 160)'' which is
        never removed).  If _s_e_t, mailboxes are never removed.
 
        NNoottee:: This only applies to mbox and MMDF folders, Mutt-ng does not delete MH
        and Maildir directories.
 
-       _7_._4_._2_4_5  _s_a_v_e___n_a_m_e
+       _7_._4_._2_4_6  _s_a_v_e___n_a_m_e
 
        Type: boolean
 
@@ -7694,28 +7776,26 @@
 
        This variable controls how copies of outgoing messages are saved.  When set, a
        check is made to see if a mailbox specified by the recipient address exists
-       (this is done by searching for a mailbox in the ``_$_f_o_l_d_e_r (section 7.4.67  ,
-       page 102)'' directory with the _u_s_e_r_n_a_m_e part of the recipient address).  If the
+       (this is done by searching for a mailbox in the ``_$_f_o_l_d_e_r (section 7.4.68  ,
+       page 103)'' directory with the _u_s_e_r_n_a_m_e part of the recipient address).  If the
        mailbox exists, the outgoing message will be saved to that mailbox, otherwise
-       the message is saved to the ``_$_r_e_c_o_r_d (section 7.4.234  , page 143)'' mailbox.
+       the message is saved to the ``_$_r_e_c_o_r_d (section 7.4.235  , page 144)'' mailbox.
 
-       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 7.4.71  , page 103)'' variable.
+       The Mutt Next Generation E-Mail Client                                      148
+
+       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 7.4.72  , page 105)'' variable.
 
-       _7_._4_._2_4_6  _s_c_o_r_e
+       _7_._4_._2_4_7  _s_c_o_r_e
 
        Type: boolean
 
        Default: yes
 
        When this variable is _u_n_s_e_t, scoring is turned off.  This can be useful to
-       selectively disable scoring for certain folders when the
-
-       The Mutt Next Generation E-Mail Client                                      147
+       selectively disable scoring for certain folders when the ``_$_s_c_o_r_e___t_h_r_e_s_h_-
+       _o_l_d___d_e_l_e_t_e (section 7.4.248  , page 148)'' variable and friends are used.
 
-       ``_$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.247  , page 146)'' variable and friends
-       are used.
-
-       _7_._4_._2_4_7  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
+       _7_._4_._2_4_8  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
 
        Type: number
 
@@ -7726,7 +7806,7 @@
        scores are always greater than or equal to zero, the default setting of this
        variable will never mark a message for deletion.
 
-       _7_._4_._2_4_8  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g
+       _7_._4_._2_4_9  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g
 
        Type: number
 
@@ -7735,7 +7815,7 @@
        Messages which have been assigned a score greater than or equal to this vari-
        able's value are automatically marked ``flagged''.
 
-       _7_._4_._2_4_9  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d
+       _7_._4_._2_5_0  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d
 
        Type: number
 
@@ -7746,7 +7826,7 @@
        scores are always greater than or equal to zero, the default setting of this
        variable will never mark a message read.
 
-       _7_._4_._2_5_0  _s_e_n_d___c_h_a_r_s_e_t
+       _7_._4_._2_5_1  _s_e_n_d___c_h_a_r_s_e_t
 
        Type: string
 
@@ -7754,32 +7834,32 @@
 
        A list of character sets for outgoing messages. Mutt-ng will use the first
        character set into which the text can be converted exactly.  If your ``_$_c_h_a_r_s_e_t
-       (section 7.4.26  , page 93)'' is not iso-8859-1 and recipients may not under-
+       (section 7.4.27  , page 94)'' is not iso-8859-1 and recipients may not under-
        stand UTF-8, it is advisable to include in the list an appropriate widely used
        standard character set (such as iso-8859-2, koi8-r or iso-2022-jp) either
+
+       The Mutt Next Generation E-Mail Client                                      149
+
        instead of or after iso-8859-1.
 
-       _7_._4_._2_5_1  _s_e_n_d_m_a_i_l
+       _7_._4_._2_5_2  _s_e_n_d_m_a_i_l
 
        Type: path
 
        Default: '/usr/sbin/sendmail -oem -oi'
 
        Specifies the program and arguments used to deliver mail sent by Mutt-ng.
-
-       The Mutt Next Generation E-Mail Client                                      148
-
        Mutt-ng expects that the specified program interprets additional arguments as
        recipient addresses.
 
-       _7_._4_._2_5_2  _s_e_n_d_m_a_i_l___w_a_i_t
+       _7_._4_._2_5_3  _s_e_n_d_m_a_i_l___w_a_i_t
 
        Type: number
 
        Default: 0
 
-       Specifies the number of seconds to wait for the ``_$_s_e_n_d_m_a_i_l (section 7.4.251  ,
-       page 147)'' process to finish before giving up and putting delivery in the
+       Specifies the number of seconds to wait for the ``_$_s_e_n_d_m_a_i_l (section 7.4.252  ,
+       page 148)'' process to finish before giving up and putting delivery in the
        background.
 
        Mutt-ng interprets the value of this variable as follows:
@@ -7797,7 +7877,7 @@
        will be put in a temporary file.  If there is some error, you will be informed
        as to where to find the output.
 
-       _7_._4_._2_5_3  _s_h_e_l_l
+       _7_._4_._2_5_4  _s_h_e_l_l
 
        Type: path
 
@@ -7806,29 +7886,29 @@
        Command to use when spawning a subshell.  By default, the user's login shell
        from /etc/passwd is used.
 
-       _7_._4_._2_5_4  _s_i_d_e_b_a_r___b_o_u_n_d_a_r_y
+       _7_._4_._2_5_5  _s_i_d_e_b_a_r___b_o_u_n_d_a_r_y
 
        Type: string
 
        Default: '.'
 
        When the sidebar is displayed and _$_s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y (section
-       7.4.258  , page 149) is _s_e_t, this variable specifies the characters at which to
+       7.4.259  , page 150) is _s_e_t, this variable specifies the characters at which to
+
+       The Mutt Next Generation E-Mail Client                                      150
+
        split a folder name into ``hierarchy items.''
 
-       _7_._4_._2_5_5  _s_i_d_e_b_a_r___d_e_l_i_m
+       _7_._4_._2_5_6  _s_i_d_e_b_a_r___d_e_l_i_m
 
        Type: string
 
        Default: '|'
 
        This specifies the delimiter between the sidebar (if visible) and other
-
-       The Mutt Next Generation E-Mail Client                                      149
-
        screens.
 
-       _7_._4_._2_5_6  _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y
+       _7_._4_._2_5_7  _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y
 
        Type: boolean
 
@@ -7836,7 +7916,7 @@
 
        If _s_e_t, only folders with new mail will be shown in the sidebar.
 
-       _7_._4_._2_5_7  _s_i_d_e_b_a_r___n_u_m_b_e_r___f_o_r_m_a_t
+       _7_._4_._2_5_8  _s_i_d_e_b_a_r___n_u_m_b_e_r___f_o_r_m_a_t
 
        Type: string
 
@@ -7871,7 +7951,9 @@
        1) These expandos only have a non-zero value for the current mailbox and will
        always be zero otherwise.
 
-       _7_._4_._2_5_8  _s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y
+       The Mutt Next Generation E-Mail Client                                      151
+
+       _7_._4_._2_5_9  _s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y
 
        Type: boolean
 
@@ -7879,18 +7961,15 @@
 
        When _s_e_t, the ``hierarchy'' of the sidebar entries will be shortened only if
        they cannot be printed in full length (because ``_$_s_i_d_e_b_a_r___w_i_d_t_h (section
-       7.4.260  , page 150)'' is set to a too low value). For example, if the
-
-       The Mutt Next Generation E-Mail Client                                      150
-
-       newsgroup name ``de.alt.sysadmin.recovery'' doesn't fit on the screen, it'll
-       get shortened ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will
-       not get shortened.
+       7.4.261  , page 151)'' is set to a too low value). For example, if the news-
+       group name ``de.alt.sysadmin.recovery'' doesn't fit on the screen, it'll get
+       shortened ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will not
+       get shortened.
 
        At which characters this compression is done is controled via the _$_s_i_d_e_-
-       _b_a_r___b_o_u_n_d_a_r_y (section 7.4.254  , page 148) variable.
+       _b_a_r___b_o_u_n_d_a_r_y (section 7.4.255  , page 149) variable.
 
-       _7_._4_._2_5_9  _s_i_d_e_b_a_r___v_i_s_i_b_l_e
+       _7_._4_._2_6_0  _s_i_d_e_b_a_r___v_i_s_i_b_l_e
 
        Type: boolean
 
@@ -7899,7 +7978,7 @@
        This specifies whether or not to show the sidebar (a list of folders specified
        with the ``mailboxes'' command).
 
-       _7_._4_._2_6_0  _s_i_d_e_b_a_r___w_i_d_t_h
+       _7_._4_._2_6_1  _s_i_d_e_b_a_r___w_i_d_t_h
 
        Type: number
 
@@ -7907,14 +7986,14 @@
 
        The width of the sidebar.
 
-       _7_._4_._2_6_1  _s_i_g___d_a_s_h_e_s
+       _7_._4_._2_6_2  _s_i_g___d_a_s_h_e_s
 
        Type: boolean
 
        Default: yes
 
        If set, a line containing ``-- '' (dash, dash, space) will be inserted before
-       your ``_$_s_i_g_n_a_t_u_r_e (section 7.4.263  , page 150)''.  It is ssttrroonnggllyy recommended
+       your ``_$_s_i_g_n_a_t_u_r_e (section 7.4.264  , page 151)''.  It is ssttrroonnggllyy recommended
        that you not unset this variable unless your ``signature'' contains just your
        name. The reason for this is because many software packages use ``-- \n'' to
        detect your signature.
@@ -7922,30 +8001,30 @@
        For example, Mutt-ng has the ability to highlight the signature in a different
        color in the builtin pager.
 
-       _7_._4_._2_6_2  _s_i_g___o_n___t_o_p
+       _7_._4_._2_6_3  _s_i_g___o_n___t_o_p
 
        Type: boolean
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      152
+
        If _s_e_t, the signature will be included before any quoted or forwarded text.  It
        is ssttrroonnggllyy recommended that you do not set this variable unless you really
        know what you are doing, and are prepared to take some heat from netiquette
        guardians.
 
-       _7_._4_._2_6_3  _s_i_g_n_a_t_u_r_e
+       _7_._4_._2_6_4  _s_i_g_n_a_t_u_r_e
 
        Type: path
 
-       The Mutt Next Generation E-Mail Client                                      151
-
        Default: '~/.signature'
 
        Specifies the filename of your signature, which is appended to all outgoing
        messages.   If the filename ends with a pipe (``|''), it is assumed that file-
        name is a shell command and input should be read from its stdout.
 
-       _7_._4_._2_6_4  _s_i_g_n_o_f_f___s_t_r_i_n_g
+       _7_._4_._2_6_5  _s_i_g_n_o_f_f___s_t_r_i_n_g
 
        Type: string
 
@@ -7958,7 +8037,7 @@
        witty quotes into your mails, better use a signature file instead of the sig-
        noff string.
 
-       _7_._4_._2_6_5  _s_i_m_p_l_e___s_e_a_r_c_h
+       _7_._4_._2_6_6  _s_i_m_p_l_e___s_e_a_r_c_h
 
        Type: string
 
@@ -7966,7 +8045,7 @@
 
        Specifies how Mutt-ng should expand a simple search into a real search pattern.
        A simple search is one that does not contain any of the ~ operators.  See
-       ``_p_a_t_t_e_r_n_s (section 7.2  , page 81)'' for more information on search patterns.
+       ``_p_a_t_t_e_r_n_s (section 7.2  , page 82)'' for more information on search patterns.
 
        For example, if you simply type ``joe'' at a search or limit prompt, Mutt-ng
        will automatically expand it to the value specified by this variable.  For the
@@ -7974,7 +8053,7 @@
 
        ~f joe | ~s joe
 
-       _7_._4_._2_6_6  _s_l_e_e_p___t_i_m_e
+       _7_._4_._2_6_7  _s_l_e_e_p___t_i_m_e
 
        Type: number
 
@@ -7985,7 +8064,9 @@
        the current folder.  The default is to pause one second, so a value of zero for
        this option suppresses the pause.
 
-       _7_._4_._2_6_7  _s_m_a_r_t___w_r_a_p
+       The Mutt Next Generation E-Mail Client                                      153
+
+       _7_._4_._2_6_8  _s_m_a_r_t___w_r_a_p
 
        Type: boolean
 
@@ -7993,23 +8074,20 @@
 
        Controls the display of lines longer than the screen width in the internal
        pager. If _s_e_t, long lines are wrapped at a word boundary.  If _u_n_s_e_t, lines are
+       simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 7.4.125  ,
+       page 119)'' variable.
 
-       The Mutt Next Generation E-Mail Client                                      152
-
-       simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 7.4.124  ,
-       page 117)'' variable.
-
-       _7_._4_._2_6_8  _s_m_i_l_e_y_s
+       _7_._4_._2_6_9  _s_m_i_l_e_y_s
 
        Type: regular expression
 
        Default: '(>From )|(:[-^]?[][)(><}{|/DP])'
 
        The _p_a_g_e_r uses this variable to catch some common false positives of
-       ``_$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.229  , page 142)'', most notably smileys in the
+       ``_$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.230  , page 143)'', most notably smileys in the
        beginning of a line
 
-       _7_._4_._2_6_9  _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l
+       _7_._4_._2_7_0  _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l
 
        Type: boolean
 
@@ -8019,7 +8097,7 @@
        cate about to be added to the database or not. It is _s_e_t by default.  (S/MIME
        only)
 
-       _7_._4_._2_7_0  _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n
+       _7_._4_._2_7_1  _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n
 
        Type: path
 
@@ -8028,7 +8106,7 @@
        This variable contains the name of either a directory, or a file which contains
        trusted certificates for use with OpenSSL.  (S/MIME only)
 
-       _7_._4_._2_7_1  _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s
+       _7_._4_._2_7_2  _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s
 
        Type: path
 
@@ -8041,7 +8119,9 @@
        address keyid pairs, and which can be manually edited. This one points to the
        location of the certificates.  (S/MIME only)
 
-       _7_._4_._2_7_2  _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d
+       The Mutt Next Generation E-Mail Client                                      154
+
+       _7_._4_._2_7_3  _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8050,8 +8130,6 @@
        This format string specifies a command which is used to decrypt application/x-
        pkcs7-mime attachments.
 
-       The Mutt Next Generation E-Mail Client                                      153
-
        The OpenSSL command formats have their own set of printf(3)-like sequences sim-
        ilar to PGP's:
 
@@ -8063,8 +8141,8 @@
                    multipart/signed attachment when verifying it.
 
              %k
-                   The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 7.4.274  ,
-                   page 153)
+                   The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 7.4.275  ,
+                   page 154)
 
              %c
                    One or more certificate IDs.
@@ -8074,15 +8152,15 @@
 
              %C
                    CA location:  Depending on whether _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section
-                   7.4.270  , page 152) points to a directory or file, this expands to
-                   '-CApath _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.270  , page 152)' or
-                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.270  , page 152)'.
+                   7.4.271  , page 153) points to a directory or file, this expands to
+                   '-CApath _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.271  , page 153)' or
+                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.271  , page 153)'.
 
        For examples on how to configure these formats, see the smime.rc in the sam-
        ples/ subdirectory which has been installed on your system alongside the docu-
        mentation.  (S/MIME only)
 
-       _7_._4_._2_7_3  _s_m_i_m_e___d_e_c_r_y_p_t___u_s_e___d_e_f_a_u_l_t___k_e_y
+       _7_._4_._2_7_4  _s_m_i_m_e___d_e_c_r_y_p_t___u_s_e___d_e_f_a_u_l_t___k_e_y
 
        Type: boolean
 
@@ -8093,26 +8171,26 @@
        mailbox-address to determine the key to use. It will ask you to supply a key,
        if it can't find one.  (S/MIME only)
 
-       _7_._4_._2_7_4  _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y
+       _7_._4_._2_7_5  _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      155
+
        Default: ''
 
        This is the default key-pair to use for signing. This must be set to the keyid
        (the hash-value that OpenSSL generates) to work properly (S/MIME only)
 
-       _7_._4_._2_7_5  _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_6  _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      154
-
        Default: ''
 
        This command is used to create encrypted S/MIME messages.  (S/MIME only)
 
-       _7_._4_._2_7_6  _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h
+       _7_._4_._2_7_7  _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h
 
        Type: string
 
@@ -8123,7 +8201,7 @@
 
        If _u_n_s_e_t ``_3_d_e_s'' (TripleDES) is used.  (S/MIME only)
 
-       _7_._4_._2_7_7  _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_8  _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8132,7 +8210,7 @@
        This command is used to extract X509 certificates from a PKCS7 structure.
        (S/MIME only)
 
-       _7_._4_._2_7_8  _s_m_i_m_e___g_e_t___c_e_r_t___e_m_a_i_l___c_o_m_m_a_n_d
+       _7_._4_._2_7_9  _s_m_i_m_e___g_e_t___c_e_r_t___e_m_a_i_l___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8142,7 +8220,7 @@
        tificates, and for verification purposes (to check whether the certificate was
        issued for the sender's mailbox).  (S/MIME only)
 
-       _7_._4_._2_7_9  _s_m_i_m_e___g_e_t___s_i_g_n_e_r___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_8_0  _s_m_i_m_e___g_e_t___s_i_g_n_e_r___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8152,7 +8230,9 @@
        signature, so that the certificate's owner may get compared to the email's
        ``From:'' header field.  (S/MIME only)
 
-       _7_._4_._2_8_0  _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d
+       The Mutt Next Generation E-Mail Client                                      156
+
+       _7_._4_._2_8_1  _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8160,9 +8240,7 @@
 
        This command is used to import a certificate via smime_keysng.  (S/MIME only)
 
-       _7_._4_._2_8_1  _s_m_i_m_e___i_s___d_e_f_a_u_l_t
-
-       The Mutt Next Generation E-Mail Client                                      155
+       _7_._4_._2_8_2  _s_m_i_m_e___i_s___d_e_f_a_u_l_t
 
        Type: boolean
 
@@ -8175,9 +8253,9 @@
        select the same application that was used to sign/encrypt the original message.
 
        (Note that this variable can be overridden by unsetting _$_c_r_y_p_t___a_u_t_o_s_m_i_m_e (sec-
-       tion 7.4.39  , page 96).)  (S/MIME only)
+       tion 7.4.40  , page 97).)  (S/MIME only)
 
-       _7_._4_._2_8_2  _s_m_i_m_e___k_e_y_s
+       _7_._4_._2_8_3  _s_m_i_m_e___k_e_y_s
 
        Type: path
 
@@ -8190,7 +8268,7 @@
        address keyid pair, and which can be manually edited. This one points to the
        location of the private keys.  (S/MIME only)
 
-       _7_._4_._2_8_3  _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d
+       _7_._4_._2_8_4  _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8199,7 +8277,7 @@
        This command is used to extract PKCS7 structures of S/MIME signatures, in order
        to extract the public X509 certificate(s).  (S/MIME only)
 
-       _7_._4_._2_8_4  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._2_8_5  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8208,7 +8286,9 @@
        This command is used to created S/MIME signatures of type multipart/signed,
        which can be read by all mail clients.  (S/MIME only)
 
-       _7_._4_._2_8_5  _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d
+       The Mutt Next Generation E-Mail Client                                      157
+
+       _7_._4_._2_8_6  _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8218,9 +8298,7 @@
        pkcs7-signature, which can only be handled by mail clients supporting the
        S/MIME extension.  (S/MIME only)
 
-       The Mutt Next Generation E-Mail Client                                      156
-
-       _7_._4_._2_8_6  _s_m_i_m_e___t_i_m_e_o_u_t
+       _7_._4_._2_8_7  _s_m_i_m_e___t_i_m_e_o_u_t
 
        Type: number
 
@@ -8229,7 +8307,7 @@
        The number of seconds after which a cached passphrase will expire if not used.
        (S/MIME only)
 
-       _7_._4_._2_8_7  _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d
+       _7_._4_._2_8_8  _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8238,7 +8316,7 @@
        This command is used to verify S/MIME signatures of type multipart/signed.
        (S/MIME only)
 
-       _7_._4_._2_8_8  _s_m_i_m_e___v_e_r_i_f_y___o_p_a_q_u_e___c_o_m_m_a_n_d
+       _7_._4_._2_8_9  _s_m_i_m_e___v_e_r_i_f_y___o_p_a_q_u_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8247,7 +8325,7 @@
        This command is used to verify S/MIME signatures of type application/x-
        pkcs7-mime.  (S/MIME only)
 
-       _7_._4_._2_8_9  _s_m_t_p___e_n_v_e_l_o_p_e
+       _7_._4_._2_9_0  _s_m_t_p___e_n_v_e_l_o_p_e
 
        Type: string
 
@@ -8262,7 +8340,9 @@
        envelope sender but only a particular one which may not be the same as the
        user's desired From: header.
 
-       _7_._4_._2_9_0  _s_m_t_p___h_o_s_t
+       _7_._4_._2_9_1  _s_m_t_p___h_o_s_t
+
+       The Mutt Next Generation E-Mail Client                                      158
 
        Type: string
 
@@ -8272,11 +8352,9 @@
 
        Defines the SMTP host which will be used to deliver mail, as opposed to invok-
        ing the sendmail binary.  Setting this variable overrides the value of ``_$_s_e_n_d_-
-       _m_a_i_l (section 7.4.251  , page 147)'', and any associated variables.
-
-       The Mutt Next Generation E-Mail Client                                      157
+       _m_a_i_l (section 7.4.252  , page 148)'', and any associated variables.
 
-       _7_._4_._2_9_1  _s_m_t_p___p_a_s_s
+       _7_._4_._2_9_2  _s_m_t_p___p_a_s_s
 
        Type: string
 
@@ -8285,13 +8363,13 @@
        Availability: SMTP
 
        Defines the password to use with SMTP AUTH.  If ``_$_s_m_t_p___u_s_e_r (section
-       7.4.294  , page 157)'' is set, but this variable is not, you will be prompted
+       7.4.295  , page 158)'' is set, but this variable is not, you will be prompted
        for a password when sending.
 
        NNoottee:: Storing passwords in a configuration file presents a security risk since
        the superuser of your machine may read it regardless of the file's permissions.
 
-       _7_._4_._2_9_2  _s_m_t_p___p_o_r_t
+       _7_._4_._2_9_3  _s_m_t_p___p_o_r_t
 
        Type: number
 
@@ -8305,7 +8383,7 @@
        Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP servers
        will probably desire 587, the mail submission port.
 
-       _7_._4_._2_9_3  _s_m_t_p___u_s_e___t_l_s
+       _7_._4_._2_9_4  _s_m_t_p___u_s_e___t_l_s
 
        Type: string
 
@@ -8319,7 +8397,9 @@
        continue without TLS in case of an error.  Muttng still needs to have SSL sup-
        port enabled in order to use it.
 
-       _7_._4_._2_9_4  _s_m_t_p___u_s_e_r
+       The Mutt Next Generation E-Mail Client                                      159
+
+       _7_._4_._2_9_5  _s_m_t_p___u_s_e_r
 
        Type: string
 
@@ -8330,9 +8410,7 @@
        Defines the username to use with SMTP AUTH.  Setting this variable will cause
        Mutt-ng to attempt to use SMTP AUTH when sending.
 
-       The Mutt Next Generation E-Mail Client                                      158
-
-       _7_._4_._2_9_5  _s_o_r_t
+       _7_._4_._2_9_6  _s_o_r_t
 
        Type: sort order
 
@@ -8354,7 +8432,7 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort=reverse-date-sent).
 
-       _7_._4_._2_9_6  _s_o_r_t___a_l_i_a_s
+       _7_._4_._2_9_7  _s_o_r_t___a_l_i_a_s
 
        Type: sort order
 
@@ -8367,32 +8445,32 @@
                alias (sort alphabetically by alias name)
                unsorted (leave in order specified in .muttrc)
 
-       _7_._4_._2_9_7  _s_o_r_t___a_u_x
+       _7_._4_._2_9_8  _s_o_r_t___a_u_x
 
        Type: sort order
 
+       The Mutt Next Generation E-Mail Client                                      160
+
        Default: date
 
        When sorting by threads, this variable controls how threads are sorted in rela-
        tion to other threads, and how the branches of the thread trees are sorted.
-       This can be set to any value that ``_$_s_o_r_t (section 7.4.295  , page 157)'' can,
+       This can be set to any value that ``_$_s_o_r_t (section 7.4.296  , page 158)'' can,
        except threads (in that case, Mutt-ng will just use date-sent).  You can also
        specify the ``last-'' prefix in addition to ``reverse-'' prefix, but last- must
        come after reverse-.  The last- prefix causes messages to be sorted against its
        siblings by which has the last descendant, using the rest of sort_aux as an
        ordering.
 
-       The Mutt Next Generation E-Mail Client                                      159
-
        For instance, set sort_aux=last-date-received would mean that if a new message
        is received in a thread, that thread becomes the last one displayed (or the
        first, if you have set sort=reverse-threads.)
 
-       NNoottee:: For reversed ``_$_s_o_r_t (section 7.4.295  , page 157)'' order _$_s_o_r_t___a_u_x
-       (section 7.4.297  , page 158) is reversed again (which is not the right thing
+       NNoottee:: For reversed ``_$_s_o_r_t (section 7.4.296  , page 158)'' order _$_s_o_r_t___a_u_x
+       (section 7.4.298  , page 159) is reversed again (which is not the right thing
        to do, but kept to not break any existing configuration setting).
 
-       _7_._4_._2_9_8  _s_o_r_t___b_r_o_w_s_e_r
+       _7_._4_._2_9_9  _s_o_r_t___b_r_o_w_s_e_r
 
        Type: sort order
 
@@ -8409,37 +8487,37 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort_browser=reverse-date).
 
-       _7_._4_._2_9_9  _s_o_r_t___r_e
+       _7_._4_._3_0_0  _s_o_r_t___r_e
 
        Type: boolean
 
        Default: yes
 
        This variable is only useful when sorting by threads with ``_$_s_t_r_i_c_t___t_h_r_e_a_d_s
-       (section 7.4.316  , page 165)'' _u_n_s_e_t. In that case, it changes the heuristic
-       Mutt-ng uses to thread messages by subject.  With _$_s_o_r_t___r_e (section 7.4.299  ,
-       page 159) _s_e_t, Mutt-ng will only attach a message as the child of another mes-
+       (section 7.4.317  , page 166)'' _u_n_s_e_t. In that case, it changes the heuristic
+       Mutt-ng uses to thread messages by subject.  With _$_s_o_r_t___r_e (section 7.4.300  ,
+       page 160) _s_e_t, Mutt-ng will only attach a message as the child of another mes-
        sage by subject if the subject of the child message starts with a substring
-       matching the setting of ``_$_r_e_p_l_y___r_e_g_e_x_p (section 7.4.235  , page 143)''. With
-       _$_s_o_r_t___r_e (section 7.4.299  , page 159) _u_n_s_e_t, Mutt-ng will attach the message
+       matching the setting of ``_$_r_e_p_l_y___r_e_g_e_x_p (section 7.4.236  , page 145)''. With
+       _$_s_o_r_t___r_e (section 7.4.300  , page 160) _u_n_s_e_t, Mutt-ng will attach the message
        whether or not this is the case, as long as the non-``_$_r_e_p_l_y___r_e_g_e_x_p (section
-       7.4.235  , page 143)'' parts of both messages are identical.
+       7.4.236  , page 145)'' parts of both messages are identical.
+
+       The Mutt Next Generation E-Mail Client                                      161
 
-       _7_._4_._3_0_0  _s_p_a_m___s_e_p_a_r_a_t_o_r
+       _7_._4_._3_0_1  _s_p_a_m___s_e_p_a_r_a_t_o_r
 
        Type: string
 
        Default: ','
 
-       ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.300  , page 159)'' controls what happens when
+       ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.301  , page 160)'' controls what happens when
        multiple spam headers are matched: if _u_n_s_e_t, each successive header will over-
        write any previous matches value for the spam label. If _s_e_t, each successive
-       match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.300  ,
-       page 159)'' as a separator.
-
-       The Mutt Next Generation E-Mail Client                                      160
+       match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.301  ,
+       page 160)'' as a separator.
 
-       _7_._4_._3_0_1  _s_p_o_o_l_f_i_l_e
+       _7_._4_._3_0_2  _s_p_o_o_l_f_i_l_e
 
        Type: path
 
@@ -8450,7 +8528,7 @@
        set this variable to the value of the environment variable $MAIL if it is not
        set.
 
-       _7_._4_._3_0_2  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
+       _7_._4_._3_0_3  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
 
        Type: path
 
@@ -8462,7 +8540,7 @@
 
        Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 
-       _7_._4_._3_0_3  _s_s_l___c_l_i_e_n_t___c_e_r_t
+       _7_._4_._3_0_4  _s_s_l___c_l_i_e_n_t___c_e_r_t
 
        Type: path
 
@@ -8472,7 +8550,7 @@
 
        The file containing a client certificate and its associated private key.
 
-       _7_._4_._3_0_4  _s_s_l___f_o_r_c_e___t_l_s
+       _7_._4_._3_0_5  _s_s_l___f_o_r_c_e___t_l_s
 
        Type: boolean
 
@@ -8481,10 +8559,13 @@
        If this variable is _s_e_t, mutt-ng will require that all connections to remote
        servers be encrypted. Furthermore it will attempt to negotiate TLS even if the
        server does not advertise the capability, since it would otherwise have to
+
+       The Mutt Next Generation E-Mail Client                                      162
+
        abort the connection anyway. This option supersedes ``_$_s_s_l___s_t_a_r_t_t_l_s (section
-       7.4.306  , page 160)''.
+       7.4.307  , page 162)''.
 
-       _7_._4_._3_0_5  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
+       _7_._4_._3_0_6  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
 
        Type: number
 
@@ -8493,13 +8574,10 @@
        Availability: GNUTLS
 
        This variable specifies the minimum acceptable prime size (in bits) for use in
-
-       The Mutt Next Generation E-Mail Client                                      161
-
        any Diffie-Hellman key exchange. A value of 0 will use the default from the
        GNUTLS library.
 
-       _7_._4_._3_0_6  _s_s_l___s_t_a_r_t_t_l_s
+       _7_._4_._3_0_7  _s_s_l___s_t_a_r_t_t_l_s
 
        Type: quadoption
 
@@ -8511,7 +8589,7 @@
        ing the capability. When _u_n_s_e_t, Mutt-ng will not attempt to use STARTTLS
        regardless of the server's capabilities.
 
-       _7_._4_._3_0_7  _s_s_l___u_s_e___s_s_l_v_2
+       _7_._4_._3_0_8  _s_s_l___u_s_e___s_s_l_v_2
 
        Type: boolean
 
@@ -8522,7 +8600,7 @@
        This variables specifies whether to attempt to use SSLv2 in the SSL authentica-
        tion process.
 
-       _7_._4_._3_0_8  _s_s_l___u_s_e___s_s_l_v_3
+       _7_._4_._3_0_9  _s_s_l___u_s_e___s_s_l_v_3
 
        Type: boolean
 
@@ -8533,38 +8611,38 @@
        This variables specifies whether to attempt to use SSLv3 in the SSL authentica-
        tion process.
 
-       _7_._4_._3_0_9  _s_s_l___u_s_e___t_l_s_v_1
+       _7_._4_._3_1_0  _s_s_l___u_s_e___t_l_s_v_1
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      163
+
        Availability: SSL or GNUTLS
 
        This variables specifies whether to attempt to use TLSv1 in the SSL authentica-
        tion process.
 
-       _7_._4_._3_1_0  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
+       _7_._4_._3_1_1  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
 
        Type: boolean
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      162
-
        Availability: SSL
 
        If set to _y_e_s, Mutt-ng will use CA certificates in the system-wide certificate
        store when checking if server certificate is signed by a trusted CA.
 
-       _7_._4_._3_1_1  _s_t_a_t_u_s___c_h_a_r_s
+       _7_._4_._3_1_2  _s_t_a_t_u_s___c_h_a_r_s
 
        Type: string
 
        Default: '-*%A'
 
        Controls the characters used by the ``%r'' indicator in ``_$_s_t_a_t_u_s___f_o_r_m_a_t (sec-
-       tion 7.4.312  , page 162)''. The first character is used when the mailbox is
+       tion 7.4.313  , page 163)''. The first character is used when the mailbox is
        unchanged. The second is used when the mailbox has been changed, and it needs
        to be resynchronized. The third is used if the mailbox is in read-only mode, or
        if the mailbox will not be written when exiting that mailbox (You can toggle
@@ -8573,7 +8651,7 @@
        been opened in attach-message mode (Certain operations like composing a new
        mail, replying, forwarding, etc. are not permitted in this mode).
 
-       _7_._4_._3_1_2  _s_t_a_t_u_s___f_o_r_m_a_t
+       _7_._4_._3_1_3  _s_t_a_t_u_s___f_o_r_m_a_t
 
        Type: string
 
@@ -8582,7 +8660,7 @@
        %l?]---(%s/%S)-%>-(%P)---'
 
        Controls the format of the status line displayed in the _i_n_d_e_x menu.  This
-       string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.113  , page 113)'', but has
+       string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.114  , page 114)'', but has
        its own set of printf(3)-like sequences:
 
              %b
@@ -8594,6 +8672,8 @@
              %d
                    number of deleted messages *
 
+       The Mutt Next Generation E-Mail Client                                      164
+
              %f
                    the full pathname of the current mailbox
 
@@ -8606,8 +8686,6 @@
              %l
                    size (in bytes) of the current mailbox *
 
-       The Mutt Next Generation E-Mail Client                                      163
-
              %L
                    size (in bytes) of the messages shown (i.e., which match the cur-
                    rent limit) *
@@ -8633,14 +8711,14 @@
 
              %r
                    modified/read-only/won't-write/attach-message indicator, according
-                   to _$_s_t_a_t_u_s___c_h_a_r_s (section 7.4.311  , page 161)
+                   to _$_s_t_a_t_u_s___c_h_a_r_s (section 7.4.312  , page 163)
 
              %s
-                   current sorting mode (_$_s_o_r_t (section 7.4.295  , page 157))
+                   current sorting mode (_$_s_o_r_t (section 7.4.296  , page 158))
 
              %S
-                   current aux sorting method (_$_s_o_r_t___a_u_x (section 7.4.297  , page
-                   158))
+                   current aux sorting method (_$_s_o_r_t___a_u_x (section 7.4.298  , page
+                   159))
 
              %t
                    number of tagged messages *
@@ -8651,6 +8729,8 @@
              %v
                    Mutt-ng version string
 
+       The Mutt Next Generation E-Mail Client                                      165
+
              %V
                    currently active limit pattern, if any *
 
@@ -8662,8 +8742,6 @@
 
        * = can be optionally printed if nonzero
 
-       The Mutt Next Generation E-Mail Client                                      164
-
        Some of the above sequences can be used to optionally print a string if their
        value is nonzero.  For example, you may only want to see the number of flagged
        messages if such messages exist, since zero is not particularly meaningful.  To
@@ -8698,7 +8776,7 @@
        replace any dots in the expansion by underscores. This might be helpful with
        IMAP folders that don't like dots in folder names.
 
-       _7_._4_._3_1_3  _s_t_a_t_u_s___o_n___t_o_p
+       _7_._4_._3_1_4  _s_t_a_t_u_s___o_n___t_o_p
 
        Type: boolean
 
@@ -8707,7 +8785,9 @@
        Setting this variable causes the ``status bar'' to be displayed on the first
        line of the screen rather than near the bottom.
 
-       _7_._4_._3_1_4  _s_t_r_i_c_t___m_a_i_l_t_o
+       The Mutt Next Generation E-Mail Client                                      166
+
+       _7_._4_._3_1_5  _s_t_r_i_c_t___m_a_i_l_t_o
 
        Type: boolean
 
@@ -8715,17 +8795,14 @@
 
        With mailto: style links, a body as well as arbitrary header information may be
        embedded. This may lead to (user) headers being overwriten without note if
-       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100)'' is unset.
+       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101)'' is unset.
 
        If this variable is _s_e_t, mutt-ng is strict and allows anything to be changed.
-
-       The Mutt Next Generation E-Mail Client                                      165
-
        If it's _u_n_s_e_t, all headers given will be prefixed with ``X-Mailto-'' and the
        message including headers will be shown in the editor regardless of what
-       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.57  , page 100)'' is set to.
+       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.58  , page 101)'' is set to.
 
-       _7_._4_._3_1_5  _s_t_r_i_c_t___m_i_m_e
+       _7_._4_._3_1_6  _s_t_r_i_c_t___m_i_m_e
 
        Type: boolean
 
@@ -8734,49 +8811,49 @@
        When _u_n_s_e_t, non MIME-compliant messages that doesn't have any charset indica-
        tion in the ``Content-Type:'' header field can be displayed (non MIME-compliant
        messages are often generated by old mailers or buggy mailers like MS Outlook
-       Express).  See also _$_a_s_s_u_m_e_d___c_h_a_r_s_e_t (section 7.4.12  , page 89).
+       Express).  See also _$_a_s_s_u_m_e_d___c_h_a_r_s_e_t (section 7.4.13  , page 90).
 
        This option also replaces linear-white-space between encoded-word and *text to
        a single space to prevent the display of MIME-encoded ``Subject:'' header field
        from being devided into multiple lines.
 
-       _7_._4_._3_1_6  _s_t_r_i_c_t___t_h_r_e_a_d_s
+       _7_._4_._3_1_7  _s_t_r_i_c_t___t_h_r_e_a_d_s
 
        Type: boolean
 
        Default: no
 
        If _s_e_t, threading will only make use of the ``In-Reply-To:'' and ``Refer-
-       ences:'' header fields when you ``_$_s_o_r_t (section 7.4.295  , page 157)'' by mes-
+       ences:'' header fields when you ``_$_s_o_r_t (section 7.4.296  , page 158)'' by mes-
        sage threads.  By default, messages with the same subject are grouped together
        in ``pseudo threads.''  This may not always be desirable, such as in a personal
        mailbox where you might have several unrelated messages with the subject ``hi''
        which will get grouped together.
 
-       _7_._4_._3_1_7  _s_t_r_i_p___w_a_s
+       _7_._4_._3_1_8  _s_t_r_i_p___w_a_s
 
        Type: boolean
 
        Default: no
 
        When _s_e_t, mutt-ng will remove the trailing part of the ``Subject:'' line which
-       matches _$_s_t_r_i_p___w_a_s___r_e_g_e_x (section 7.4.318  , page 165) when replying. This is
+       matches _$_s_t_r_i_p___w_a_s___r_e_g_e_x (section 7.4.319  , page 166) when replying. This is
        useful to properly react on subject changes and reduce ``subject noise.'' (esp.
        in Usenet)
 
-       _7_._4_._3_1_8  _s_t_r_i_p___w_a_s___r_e_g_e_x
+       The Mutt Next Generation E-Mail Client                                      167
+
+       _7_._4_._3_1_9  _s_t_r_i_p___w_a_s___r_e_g_e_x
 
        Type: regular expression
 
        Default: '\([Ww][Aa][RrSs]: .*\)[ ]*$'
 
-       When non-empty and _$_s_t_r_i_p___w_a_s (section 7.4.317  , page 165) is _s_e_t, mutt-ng
+       When non-empty and _$_s_t_r_i_p___w_a_s (section 7.4.318  , page 166) is _s_e_t, mutt-ng
        will remove this trailing part of the ``Subject'' line when replying if it
        won't be empty afterwards.
 
-       The Mutt Next Generation E-Mail Client                                      166
-
-       _7_._4_._3_1_9  _s_t_u_f_f___q_u_o_t_e_d
+       _7_._4_._3_2_0  _s_t_u_f_f___q_u_o_t_e_d
 
        Type: boolean
 
@@ -8785,7 +8862,7 @@
        If _s_e_t, attachments with flowed format will have their quoting ``stuffed'',
        i.e. a space will be inserted between the quote characters and the actual text.
 
-       _7_._4_._3_2_0  _s_u_s_p_e_n_d
+       _7_._4_._3_2_1  _s_u_s_p_e_n_d
 
        Type: boolean
 
@@ -8795,7 +8872,7 @@
        usually CTRL+Z. This is useful if you run Mutt-ng inside an xterm using a com-
        mand like ``xterm -e muttng.''
 
-       _7_._4_._3_2_1  _t_e_x_t___f_l_o_w_e_d
+       _7_._4_._3_2_2  _t_e_x_t___f_l_o_w_e_d
 
        Type: boolean
 
@@ -8806,21 +8883,23 @@
        like ordinary text.  To actually make use of this format's features, you'll
        need support in your editor.
 
-       Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.112  , page 113) is ignored when this
+       Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.113  , page 114) is ignored when this
        option is set.
 
-       _7_._4_._3_2_2  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
+       _7_._4_._3_2_3  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
 
        Type: boolean
 
        Default: no
 
        Affects the ~b and ~h search operations described in section ``_p_a_t_t_e_r_n_s (sec-
-       tion 7.2  , page 81)'' above.  If _s_e_t, the headers and attachments of messages
+       tion 7.2  , page 82)'' above.  If _s_e_t, the headers and attachments of messages
        to be searched are decoded before searching.  If _u_n_s_e_t, messages are searched
        as they appear in the folder.
 
-       _7_._4_._3_2_3  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
+       The Mutt Next Generation E-Mail Client                                      168
+
+       _7_._4_._3_2_4  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
 
        Type: boolean
 
@@ -8829,9 +8908,7 @@
        When _s_e_t, Mutt-ng uses the date received rather than the date sent to thread
        messages by subject.
 
-       The Mutt Next Generation E-Mail Client                                      167
-
-       _7_._4_._3_2_4  _t_i_l_d_e
+       _7_._4_._3_2_5  _t_i_l_d_e
 
        Type: boolean
 
@@ -8840,7 +8917,7 @@
        When _s_e_t, the internal-pager will pad blank lines to the bottom of the screen
        with a tilde (~).
 
-       _7_._4_._3_2_5  _t_i_m_e_o_u_t
+       _7_._4_._3_2_6  _t_i_m_e_o_u_t
 
        Type: number
 
@@ -8850,7 +8927,7 @@
        pressed in the main menu before timing out and checking for new mail.  A value
        of zero or less will cause Mutt-ng to never time out.
 
-       _7_._4_._3_2_6  _t_m_p_d_i_r
+       _7_._4_._3_2_7  _t_m_p_d_i_r
 
        Type: path
 
@@ -8861,7 +8938,7 @@
        set, the environment variable $TMPDIR is used.  If $TMPDIR is not set then
        '/tmp' is used.
 
-       _7_._4_._3_2_7  _t_o___c_h_a_r_s
+       _7_._4_._3_2_8  _t_o___c_h_a_r_s
 
        Type: string
 
@@ -8877,7 +8954,9 @@
        indicate mail that was sent by _y_o_u.  The sixth character is used to indicate
        when a mail was sent to a mailing-list you're subscribe to (default: L).
 
-       _7_._4_._3_2_8  _t_r_a_s_h
+       The Mutt Next Generation E-Mail Client                                      169
+
+       _7_._4_._3_2_9  _t_r_a_s_h
 
        Type: path
 
@@ -8886,12 +8965,10 @@
        If _s_e_t, this variable specifies the path of the trash folder where the mails
        marked for deletion will be moved, instead of being irremediably purged.
 
-       The Mutt Next Generation E-Mail Client                                      168
-
        NNoottee: When you delete a message in the trash folder, it is really deleted, so
        that there is no way to recover mail.
 
-       _7_._4_._3_2_9  _t_u_n_n_e_l
+       _7_._4_._3_3_0  _t_u_n_n_e_l
 
        Type: string
 
@@ -8906,7 +8983,7 @@
        NNoottee:: For this example to work you must be able to log in to the remote machine
        without having to enter a password.
 
-       _7_._4_._3_3_0  _u_m_a_s_k
+       _7_._4_._3_3_1  _u_m_a_s_k
 
        Type: number
 
@@ -8915,7 +8992,7 @@
        This sets the umask that will be used by Mutt-ng when creating all kinds of
        files. If _u_n_s_e_t, the default value is 077.
 
-       _7_._4_._3_3_1  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
+       _7_._4_._3_3_2  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
 
        Type: boolean
 
@@ -8924,7 +9001,7 @@
        When _s_e_t, Mutt-ng will jump to the next unread message, if any, when the cur-
        rent thread is _u_ncollapsed.
 
-       _7_._4_._3_3_2  _u_s_e___8_b_i_t_m_i_m_e
+       _7_._4_._3_3_3  _u_s_e___8_b_i_t_m_i_m_e
 
        Type: boolean
 
@@ -8933,25 +9010,26 @@
        WWaarrnniinngg:: do not set this variable unless you are using a version of sendmail
        which supports the -B8BITMIME flag (such as sendmail 8.8.x) or in connection
        with the SMTP support via libESMTP.  Otherwise you may not be able to send
+
+       The Mutt Next Generation E-Mail Client                                      170
+
        mail.
 
-       When _s_e_t, Mutt-ng will either invoke ``_$_s_e_n_d_m_a_i_l (section 7.4.251  , page
-       147)'' with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP
+       When _s_e_t, Mutt-ng will either invoke ``_$_s_e_n_d_m_a_i_l (section 7.4.252  , page
+       148)'' with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP
        negotiation or tell libESMTP to do so.
 
-       _7_._4_._3_3_3  _u_s_e___d_o_m_a_i_n
+       _7_._4_._3_3_4  _u_s_e___d_o_m_a_i_n
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      169
-
        Default: yes
 
        When _s_e_t, Mutt-ng will qualify all local addresses (ones without the @host por-
-       tion) with the value of ``_$_h_o_s_t_n_a_m_e (section 7.4.92  , page 108)''.  If _u_n_s_e_t,
+       tion) with the value of ``_$_h_o_s_t_n_a_m_e (section 7.4.93  , page 109)''.  If _u_n_s_e_t,
        no addresses will be qualified.
 
-       _7_._4_._3_3_4  _u_s_e___f_r_o_m
+       _7_._4_._3_3_5  _u_s_e___f_r_o_m
 
        Type: boolean
 
@@ -8959,9 +9037,9 @@
 
        When _s_e_t, Mutt-ng will generate the ``From:'' header field when sending mes-
        sages. If _u_n_s_e_t, no ``From:'' header field will be generated unless the user
-       explicitly sets one using the ``_m_y___h_d_r (section 3.15  , page 35)'' command.
+       explicitly sets one using the ``_m_y___h_d_r (section 3.16  , page 36)'' command.
 
-       _7_._4_._3_3_5  _u_s_e___i_d_n
+       _7_._4_._3_3_6  _u_s_e___i_d_n
 
        Type: boolean
 
@@ -8974,7 +9052,7 @@
        NNoottee:: You can use IDNs for addresses even if this is _u_n_s_e_t.  This variable only
        affects decoding.
 
-       _7_._4_._3_3_6  _u_s_e___i_p_v_6
+       _7_._4_._3_3_7  _u_s_e___i_p_v_6
 
        Type: boolean
 
@@ -8984,22 +9062,13 @@
        If this option is _u_n_s_e_t, Mutt-ng will restrict itself to IPv4 addresses.  Nor-
        mally, the default should work.
 
-       _7_._4_._3_3_7  _u_s_e_r___a_g_e_n_t
-
-       Type: boolean
-
-       Default: yes
-
-       When _s_e_t, Mutt-ng will add a ``User-Agent:'' header to outgoing messages, indi-
-       cating which version of Mutt-ng was used for composing them.
-
        _7_._4_._3_3_8  _v_i_s_u_a_l
 
        Type: path
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      170
+       The Mutt Next Generation E-Mail Client                                      171
 
        Specifies the visual editor to invoke when the _~_v command is given in the
        builtin editor.
@@ -9014,7 +9083,7 @@
        _m_e_s_s_a_g_e, _p_i_p_e_-_e_n_t_r_y, _p_r_i_n_t_-_m_e_s_s_a_g_e, and _p_r_i_n_t_-_e_n_t_r_y commands.
 
        It is also used when viewing attachments with ``_a_u_t_o___v_i_e_w (section 5.4  , page
-       76)'', provided that the corresponding mailcap entry has a needsterminal flag,
+       77)'', provided that the corresponding mailcap entry has a needsterminal flag,
        and the external program is interactive.
 
        When _s_e_t, Mutt-ng will always ask for a key. When _u_n_s_e_t, Mutt-ng will wait for
@@ -9055,7 +9124,7 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      171
+       The Mutt Next Generation E-Mail Client                                      172
 
        Controls whether Mutt-ng writes out the Bcc header when preparing messages to
        be sent.  Exim users may wish to _u_n_s_e_t this.
@@ -9070,7 +9139,7 @@
        indicate progress.  If set to 0, only a single message will be displayed before
        writing a mailbox.
 
-       Also see the ``_$_r_e_a_d___i_n_c (section 7.4.230  , page 142)'' variable.
+       Also see the ``_$_r_e_a_d___i_n_c (section 7.4.231  , page 143)'' variable.
 
        _7_._4_._3_4_5  _x_t_e_r_m___i_c_o_n
 
@@ -9079,8 +9148,8 @@
        Default: 'M%?n?AIL&ail?'
 
        Controls the format of the X11 icon title, as long as _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (sec-
-       tion 7.4.347  , page 171) is _s_e_t. This string is identical in formatting to the
-       one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.312  , page 162)''.
+       tion 7.4.347  , page 172) is _s_e_t. This string is identical in formatting to the
+       one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.313  , page 163)''.
 
        _7_._4_._3_4_6  _x_t_e_r_m___l_e_a_v_e
 
@@ -9088,7 +9157,7 @@
 
        Default: ''
 
-       If _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.347  , page 171) is _s_e_t, this string will be
+       If _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.347  , page 172) is _s_e_t, this string will be
        used to set the title when leaving mutt-ng. For terminal-based programs,
        there's no easy and portable way to read the current title so mutt-ng cannot
        read it upon startup and restore it when exiting.
@@ -9112,21 +9181,21 @@
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      172
+       The Mutt Next Generation E-Mail Client                                      173
 
        Default: 'Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?'
 
        Controls the format of the title bar of the xterm provided that
-       _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.347  , page 171) has been _s_e_t. This string is
-       identical in formatting to the one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.312  ,
-       page 162)''.
+       _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.347  , page 172) has been _s_e_t. This string is
+       identical in formatting to the one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.313  ,
+       page 163)''.
 
        _7_._5  _F_u_n_c_t_i_o_n_s
 
        The following is the list of available functions listed by the mapping in which
        they are available.  The default key setting is given, and an explanation of
        what the function does.  The key bindings of these functions can be changed
-       with the _b_i_n_d (section 3.4  , page 24) command.
+       with the _b_i_n_d (section 3.5  , page 25) command.
 
        _7_._5_._1  _g_e_n_e_r_i_c
 
@@ -9167,11 +9236,11 @@
             top-page                   H   move to the top of the page
             what-key           not bound   display the keycode for a key press
 
-       The Mutt Next Generation E-Mail Client                                      173
+       The Mutt Next Generation E-Mail Client                                      174
 
        _7_._5_._2  _i_n_d_e_x
 
-       The Mutt Next Generation E-Mail Client                                      174
+       The Mutt Next Generation E-Mail Client                                      175
 
             bounce-message             b   remail a message to another user
             change-folder              c   open a different folder
@@ -9228,7 +9297,7 @@
             show-version               V   show the Mutt-ng version number and date
             show-limit             ESC l   show currently active limit pattern, if any
 
-       The Mutt Next Generation E-Mail Client                                      175
+       The Mutt Next Generation E-Mail Client                                      176
 
             sort-mailbox               o   sort messages
             sort-reverse               O   sort messages in reverse order
@@ -9246,7 +9315,7 @@
 
        _7_._5_._3  _p_a_g_e_r
 
-       The Mutt Next Generation E-Mail Client                                      176
+       The Mutt Next Generation E-Mail Client                                      177
 
             bottom             not bound   jump to the bottom of the message
             bounce-message             b   remail a message to another user
@@ -9303,7 +9372,7 @@
             recall-message             R   recall a postponed message
             redraw-screen             ^L   clear and redraw the screen
 
-       The Mutt Next Generation E-Mail Client                                      177
+       The Mutt Next Generation E-Mail Client                                      178
 
             reply                      r   reply to a message
             save-message               s   save message/attachment to a file
@@ -9343,7 +9412,7 @@
 
        _7_._5_._6  _a_t_t_a_c_h
 
-       The Mutt Next Generation E-Mail Client                                      178
+       The Mutt Next Generation E-Mail Client                                      179
 
             bounce-message             b   remail a message to another user
             collapse-parts             v   toggle display of subparts
@@ -9366,7 +9435,7 @@
 
        _7_._5_._7  _c_o_m_p_o_s_e
 
-       The Mutt Next Generation E-Mail Client                                      179
+       The Mutt Next Generation E-Mail Client                                      180
 
             attach-file                a   attach a file(s) to this message
             attach-message             A   attach message(s) to this message
@@ -9409,7 +9478,7 @@
 
        _7_._5_._9  _b_r_o_w_s_e_r
 
-       The Mutt Next Generation E-Mail Client                                      180
+       The Mutt Next Generation E-Mail Client                                      181
 
             change-dir                 c   change directories
             check-new                TAB   check mailboxes for new mail
@@ -9458,7 +9527,7 @@
 
        _8_.  _M_i_s_c_e_l_l_a_n_y
 
-       The Mutt Next Generation E-Mail Client                                      181
+       The Mutt Next Generation E-Mail Client                                      182
 
        _8_._1  _A_c_k_n_o_w_l_e_d_g_m_e_n_t_s
 
@@ -9515,7 +9584,7 @@
 
        Felix von Leitner (a.k.a ``Fefe'') <leitner@math.fu-berlin.de>,
 
-       The Mutt Next Generation E-Mail Client                                      182
+       The Mutt Next Generation E-Mail Client                                      183
 
        Brandon Long <blong@fiction.net>,
 
@@ -9571,14 +9640,14 @@
 
        Elimar Riesebieter <riesebie@lxtec.de>
 
-       The Mutt Next Generation E-Mail Client                                      183
+       The Mutt Next Generation E-Mail Client                                      184
 
        _8_._2  _A_b_o_u_t _t_h_i_s _d_o_c_u_m_e_n_t
 
        This document was written in SGML, and then rendered using the sgml-tools pack-
        age.
 
-       The Mutt Next Generation E-Mail Client                                      184
+       The Mutt Next Generation E-Mail Client                                      185
 
                                           CONTENTS
 
@@ -9627,501 +9696,507 @@
 
        3.  Configuration   ........................................................ 21
            3.1   Locations of Configuration Files   ............................... 21
-           3.2   Syntax of Initialization Files   ................................. 21
-           3.3   Defining/Using aliases   ......................................... 23
-           3.4   Changing the default key bindings   .............................. 24
-           3.5   Defining aliases for character sets    ........................... 26
+           3.2   Basic Syntax of Initialization Files   ........................... 21
+           3.3   Variable Expansion     ........................................... 23
+                 3.3.1    Commands' Output        23
+                 3.3.2    Environment Variables        23
 
                                               i
 
-           3.6   Setting variables based upon mailbox   ........................... 26
-           3.7   Keyboard macros   ................................................ 27
-           3.8   Using color and mono video attributes   .......................... 28
-           3.9   Ignoring (weeding) unwanted message headers   .................... 30
-           3.10  Alternative addresses   .......................................... 31
-           3.11  Format = Flowed     .............................................. 31
-                 3.11.1   Introduction         31
-                 3.11.2   Receiving: Display Setup         31
-                 3.11.3   Sending         32
-                 3.11.4   Additional Notes    33
-           3.12  Mailing lists   .................................................. 33
-           3.13  Using Multiple spool mailboxes   ................................. 34
-           3.14  Defining mailboxes which receive mail   .......................... 34
-           3.15  User defined headers   ........................................... 35
-           3.16  Defining the order of headers when viewing messages   ............ 36
-           3.17  Specify default save filename   .................................. 36
-           3.18  Specify default Fcc: mailbox when composing   .................... 36
-           3.19  Specify default save filename and default Fcc: mailbox at once   . 37
-           3.20  Change settings based upon message recipients   .................. 37
-           3.21  Change settings before formatting a message   .................... 38
-           3.22  Choosing the cryptographic key of the recipient   ................ 38
-           3.23  Adding key sequences to the keyboard buffer   .................... 38
-           3.24  Executing functions   ............................................ 39
-           3.25  Message Scoring   ................................................ 39
-           3.26  Spam detection   ................................................. 40
-           3.27  Setting variables   .............................................. 42
-           3.28  Reading initialization commands from another file   .............. 43
-           3.29  Removing hooks   ................................................. 43
-           3.30  Sharing Setups       ............................................. 43
-                 3.30.1   Character Sets         43
-                 3.30.2   Modularization           44
-                 3.30.3   Conditional parts         44
-           3.31  Obsolete Variables   ............................................. 46
-
-       4.  Advanced Usage   ....................................................... 46
-           4.1   Regular Expressions   ............................................ 46
-           4.2   Patterns   ....................................................... 49
-                 4.2.1    Complex Patterns    49
-                 4.2.2    Patterns and Dates    50
-           4.3   Format Strings       ............................................. 50
-                 4.3.1    Introduction           50
-                 4.3.2    Conditional Expansion           52
-                 4.3.3    Modifications and Padding           53
-           4.4   Using Tags   ..................................................... 53
-           4.5   Using Hooks   .................................................... 54
-                 4.5.1    Message Matching in Hooks   55
-           4.6   Using the sidebar   .............................................. 55
-           4.7   External Address Queries   ....................................... 56
-           4.8   Mailbox Formats   ................................................ 57
-           4.9   Mailbox Shortcuts   .............................................. 58
-           4.10  Handling Mailing Lists   ......................................... 58
-           4.11  Editing threads   ................................................ 59
-                 4.11.1   Linking threads   60
+                 3.3.3    Configuration Variables        23
+                 3.3.4    Self-Defined Variables        23
+                 3.3.5    Type Conversions        24
+           3.4   Defining/Using aliases   ......................................... 24
+           3.5   Changing the default key bindings   .............................. 25
+           3.6   Defining aliases for character sets    ........................... 27
+           3.7   Setting variables based upon mailbox   ........................... 27
+           3.8   Keyboard macros   ................................................ 28
+           3.9   Using color and mono video attributes   .......................... 29
+           3.10  Ignoring (weeding) unwanted message headers   .................... 31
+           3.11  Alternative addresses   .......................................... 32
+           3.12  Format = Flowed     .............................................. 32
+                 3.12.1   Introduction         32
+                 3.12.2   Receiving: Display Setup         33
+                 3.12.3   Sending         34
+                 3.12.4   Additional Notes    34
+           3.13  Mailing lists   .................................................. 34
+           3.14  Using Multiple spool mailboxes   ................................. 35
+           3.15  Defining mailboxes which receive mail   .......................... 36
+           3.16  User defined headers   ........................................... 36
+           3.17  Defining the order of headers when viewing messages   ............ 37
+           3.18  Specify default save filename   .................................. 37
+           3.19  Specify default Fcc: mailbox when composing   .................... 38
+           3.20  Specify default save filename and default Fcc: mailbox at once   . 38
+           3.21  Change settings based upon message recipients   .................. 38
+           3.22  Change settings before formatting a message   .................... 39
+           3.23  Choosing the cryptographic key of the recipient   ................ 39
+           3.24  Adding key sequences to the keyboard buffer   .................... 40
+           3.25  Executing functions   ............................................ 40
+           3.26  Message Scoring   ................................................ 40
+           3.27  Spam detection   ................................................. 41
+           3.28  Setting variables   .............................................. 43
+           3.29  Reading initialization commands from another file   .............. 44
+           3.30  Removing hooks   ................................................. 44
+           3.31  Sharing Setups       ............................................. 44
+                 3.31.1   Character Sets         45
+                 3.31.2   Modularization           45
+                 3.31.3   Conditional parts         45
+           3.32  Obsolete Variables   ............................................. 47
+
+       4.  Advanced Usage   ....................................................... 47
+           4.1   Regular Expressions   ............................................ 47
+           4.2   Patterns   ....................................................... 50
+                 4.2.1    Complex Patterns    50
+                 4.2.2    Patterns and Dates    51
+           4.3   Format Strings       ............................................. 52
+                 4.3.1    Introduction           52
+                 4.3.2    Conditional Expansion           53
+                 4.3.3    Modifications and Padding           54
+           4.4   Using Tags   ..................................................... 55
+           4.5   Using Hooks   .................................................... 55
+                 4.5.1    Message Matching in Hooks   56
+           4.6   Using the sidebar   .............................................. 56
 
                                               ii
 
-                 4.11.2   Breaking threads   60
-           4.12  Delivery Status Notification (DSN) Support   ..................... 60
-           4.13  POP3 Support (OPTIONAL)   ........................................ 60
-           4.14  IMAP Support (OPTIONAL)   ........................................ 61
-                 4.14.1   The Folder Browser   62
-                 4.14.2   Authentication   62
-           4.15  NNTP Support (OPTIONAL)   ........................................ 63
-                 4.15.1   Again: Scoring       63
-           4.16  SMTP Support (OPTIONAL)   ........................................ 64
-           4.17  Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)   ............ 65
-           4.18  Start a WWW Browser on URLs (EXTERNAL)   ......................... 65
-           4.19  Compressed folders Support (OPTIONAL)   .......................... 65
-                 4.19.1   Open a compressed mailbox for reading   66
-                 4.19.2   Write a compressed mailbox   66
-                 4.19.3   Append a message to a compressed mailbox   67
-                 4.19.4   Encrypted folders   68
-
-       5.  Mutt-ng's MIME Support   ............................................... 68
-           5.1   Using MIME in Mutt   ............................................. 68
-                 5.1.1    Viewing MIME messages in the pager   68
-                 5.1.2    The Attachment Menu   69
-                 5.1.3    The Compose Menu   69
-           5.2   MIME Type configuration with mime.types   ........................ 69
-           5.3   MIME Viewer configuration with mailcap   ......................... 70
-                 5.3.1    The Basics of the mailcap file   71
-                 5.3.2    Secure use of mailcap   72
-                 5.3.3    Advanced mailcap Usage   72
-                 5.3.4    Example mailcap files   75
-           5.4   MIME Autoview   .................................................. 76
-           5.5   MIME Multipart/Alternative   ..................................... 77
-           5.6   MIME Lookup   .................................................... 77
-
-       6.  Security Considerations     ............................................ 78
-           6.1   Passwords       .................................................. 78
-           6.2   Temporary Files       ............................................ 78
-           6.3   Information Leaks     ............................................ 78
-                 6.3.1    Message-ID: headers         78
-                 6.3.2    mailto:-style links         79
-           6.4   External applications       ...................................... 79
-                 6.4.1    mailcap           79
-                 6.4.2    Other           80
-
-       7.  Reference   ............................................................ 80
-           7.1   Command line options   ........................................... 80
-           7.2   Patterns   ....................................................... 81
-           7.3   Configuration Commands   ......................................... 83
-           7.4   Configuration variables .......................................... 85
-                 7.4.1    abort_noattach   86
-                 7.4.2    abort_nosubject   87
-                 7.4.3    abort_unmodified   87
-                 7.4.4    alias_file   87
-                 7.4.5    alias_format   87
-                 7.4.6    allow_8bit   88
+           4.7   External Address Queries   ....................................... 57
+           4.8   Mailbox Formats   ................................................ 58
+           4.9   Mailbox Shortcuts   .............................................. 59
+           4.10  Handling Mailing Lists   ......................................... 59
+           4.11  Editing threads   ................................................ 61
+                 4.11.1   Linking threads   61
+                 4.11.2   Breaking threads   61
+           4.12  Delivery Status Notification (DSN) Support   ..................... 61
+           4.13  POP3 Support (OPTIONAL)   ........................................ 62
+           4.14  IMAP Support (OPTIONAL)   ........................................ 62
+                 4.14.1   The Folder Browser   63
+                 4.14.2   Authentication   64
+           4.15  NNTP Support (OPTIONAL)   ........................................ 64
+                 4.15.1   Again: Scoring       64
+           4.16  SMTP Support (OPTIONAL)   ........................................ 65
+           4.17  Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)   ............ 66
+           4.18  Start a WWW Browser on URLs (EXTERNAL)   ......................... 66
+           4.19  Compressed folders Support (OPTIONAL)   .......................... 66
+                 4.19.1   Open a compressed mailbox for reading   67
+                 4.19.2   Write a compressed mailbox   68
+                 4.19.3   Append a message to a compressed mailbox   68
+                 4.19.4   Encrypted folders   69
+
+       5.  Mutt-ng's MIME Support   ............................................... 69
+           5.1   Using MIME in Mutt   ............................................. 69
+                 5.1.1    Viewing MIME messages in the pager   69
+                 5.1.2    The Attachment Menu   70
+                 5.1.3    The Compose Menu   70
+           5.2   MIME Type configuration with mime.types   ........................ 71
+           5.3   MIME Viewer configuration with mailcap   ......................... 71
+                 5.3.1    The Basics of the mailcap file   72
+                 5.3.2    Secure use of mailcap   73
+                 5.3.3    Advanced mailcap Usage   73
+                 5.3.4    Example mailcap files   76
+           5.4   MIME Autoview   .................................................. 77
+           5.5   MIME Multipart/Alternative   ..................................... 78
+           5.6   MIME Lookup   .................................................... 78
+
+       6.  Security Considerations     ............................................ 79
+           6.1   Passwords       .................................................. 79
+           6.2   Temporary Files       ............................................ 79
+           6.3   Information Leaks     ............................................ 80
+                 6.3.1    Message-ID: headers         80
+                 6.3.2    mailto:-style links         80
+           6.4   External applications       ...................................... 80
+                 6.4.1    mailcap           80
+                 6.4.2    Other           81
+
+       7.  Reference   ............................................................ 81
+           7.1   Command line options   ........................................... 81
+           7.2   Patterns   ....................................................... 82
+           7.3   Configuration Commands   ......................................... 84
+           7.4   Configuration variables .......................................... 86
 
                                              iii
 
-                 7.4.7    allow_ansi   88
-                 7.4.8    arrow_cursor   88
-                 7.4.9    ascii_chars   88
-                 7.4.10   askbcc   89
-                 7.4.11   askcc   89
-                 7.4.12   assumed_charset   89
-                 7.4.13   attach_format   89
-                 7.4.14   attach_remind_regexp   90
-                 7.4.15   attach_sep   90
-                 7.4.16   attach_split   91
-                 7.4.17   attribution   91
-                 7.4.18   auto_tag   91
-                 7.4.19   autoedit   91
-                 7.4.20   beep   92
-                 7.4.21   beep_new   92
-                 7.4.22   bounce   92
-                 7.4.23   bounce_delivered   92
-                 7.4.24   braille_friendly   92
-                 7.4.25   certificate_file   92
-                 7.4.26   charset   93
-                 7.4.27   check_new   93
-                 7.4.28   collapse_unread   93
-                 7.4.29   compose_format   93
-                 7.4.30   config_charset   94
-                 7.4.31   confirmappend   94
-                 7.4.32   confirmcreate   94
-                 7.4.33   connect_timeout   94
-                 7.4.34   content_type   95
-                 7.4.35   copy   95
-                 7.4.36   crypt_autoencrypt   95
-                 7.4.37   crypt_autopgp   95
-                 7.4.38   crypt_autosign   95
-                 7.4.39   crypt_autosmime   96
-                 7.4.40   crypt_replyencrypt   96
-                 7.4.41   crypt_replysign   96
-                 7.4.42   crypt_replysignencrypted   96
-                 7.4.43   crypt_timestamp   96
-                 7.4.44   crypt_use_gpgme   97
-                 7.4.45   crypt_verify_sig   97
-                 7.4.46   date_format   97
-                 7.4.47   default_hook   97
-                 7.4.48   delete   98
-                 7.4.49   delete_space   98
-                 7.4.50   delete_untag   98
-                 7.4.51   digest_collapse   98
-                 7.4.52   display_filter   98
-                 7.4.53   dotlock_program   99
-                 7.4.54   dsn_notify   99
-                 7.4.55   dsn_return   99
-                 7.4.56   duplicate_threads   99
-                 7.4.57   edit_headers   100
-                 7.4.58   editor   100
-                 7.4.59   encode_from   100
+                 7.4.1    abort_noattach   87
+                 7.4.2    abort_nosubject   88
+                 7.4.3    abort_unmodified   88
+                 7.4.4    agent_string   88
+                 7.4.5    alias_file   88
+                 7.4.6    alias_format   88
+                 7.4.7    allow_8bit   89
+                 7.4.8    allow_ansi   89
+                 7.4.9    arrow_cursor   89
+                 7.4.10   ascii_chars   90
+                 7.4.11   askbcc   90
+                 7.4.12   askcc   90
+                 7.4.13   assumed_charset   90
+                 7.4.14   attach_format   90
+                 7.4.15   attach_remind_regexp   91
+                 7.4.16   attach_sep   92
+                 7.4.17   attach_split   92
+                 7.4.18   attribution   92
+                 7.4.19   auto_tag   92
+                 7.4.20   autoedit   92
+                 7.4.21   beep   93
+                 7.4.22   beep_new   93
+                 7.4.23   bounce   93
+                 7.4.24   bounce_delivered   93
+                 7.4.25   braille_friendly   93
+                 7.4.26   certificate_file   94
+                 7.4.27   charset   94
+                 7.4.28   check_new   94
+                 7.4.29   collapse_unread   94
+                 7.4.30   compose_format   95
+                 7.4.31   config_charset   95
+                 7.4.32   confirmappend   95
+                 7.4.33   confirmcreate   95
+                 7.4.34   connect_timeout   95
+                 7.4.35   content_type   96
+                 7.4.36   copy   96
+                 7.4.37   crypt_autoencrypt   96
+                 7.4.38   crypt_autopgp   96
+                 7.4.39   crypt_autosign   97
+                 7.4.40   crypt_autosmime   97
+                 7.4.41   crypt_replyencrypt   97
+                 7.4.42   crypt_replysign   97
+                 7.4.43   crypt_replysignencrypted   97
+                 7.4.44   crypt_timestamp   98
+                 7.4.45   crypt_use_gpgme   98
+                 7.4.46   crypt_verify_sig   98
+                 7.4.47   date_format   98
+                 7.4.48   default_hook   99
+                 7.4.49   delete   99
+                 7.4.50   delete_space   99
+                 7.4.51   delete_untag   99
+                 7.4.52   digest_collapse   99
+                 7.4.53   display_filter   100
 
                                               iv
 
-                 7.4.60   entropy_file   100
-                 7.4.61   envelope_from   101
-                 7.4.62   escape   101
-                 7.4.63   fast_reply   101
-                 7.4.64   fcc_attach   101
-                 7.4.65   fcc_clear   101
-                 7.4.66   file_charset   101
-                 7.4.67   folder   102
-                 7.4.68   folder_format   102
-                 7.4.69   followup_to   103
-                 7.4.70   force_buffy_check   103
-                 7.4.71   force_name   103
-                 7.4.72   forward_decode   104
-                 7.4.73   forward_decrypt   104
-                 7.4.74   forward_edit   104
-                 7.4.75   forward_format   104
-                 7.4.76   forward_quote   104
-                 7.4.77   from   105
-                 7.4.78   gecos_mask   105
-                 7.4.79   hdrs   105
-                 7.4.80   header   105
-                 7.4.81   header_cache   106
-                 7.4.82   header_cache_compress   106
-                 7.4.83   help   106
-                 7.4.84   hidden_host   106
-                 7.4.85   hide_limited   107
-                 7.4.86   hide_missing   107
-                 7.4.87   hide_thread_subject   107
-                 7.4.88   hide_top_limited   107
-                 7.4.89   hide_top_missing   107
-                 7.4.90   history   107
-                 7.4.91   honor_followup_to   108
-                 7.4.92   hostname   108
-                 7.4.93   ignore_list_reply_to   108
-                 7.4.94   imap_authenticators   108
-                 7.4.95   imap_check_subscribed   109
-                 7.4.96   imap_delim_chars   109
-                 7.4.97   imap_headers   109
-                 7.4.98   imap_home_namespace   109
-                 7.4.99   imap_keepalive   110
-                 7.4.100  imap_list_subscribed   110
-                 7.4.101  imap_login   110
-                 7.4.102  imap_mail_check   110
-                 7.4.103  imap_pass   111
-                 7.4.104  imap_passive   111
-                 7.4.105  imap_peek   111
-                 7.4.106  imap_reconnect   111
-                 7.4.107  imap_servernoise   112
-                 7.4.108  imap_user   112
-                 7.4.109  implicit_autoview   112
-                 7.4.110  include   112
-                 7.4.111  include_onlyfirst   112
-                 7.4.112  indent_string   113
+                 7.4.54   dotlock_program   100
+                 7.4.55   dsn_notify   100
+                 7.4.56   dsn_return   100
+                 7.4.57   duplicate_threads   101
+                 7.4.58   edit_headers   101
+                 7.4.59   editor   101
+                 7.4.60   encode_from   101
+                 7.4.61   entropy_file   101
+                 7.4.62   envelope_from   102
+                 7.4.63   escape   102
+                 7.4.64   fast_reply   102
+                 7.4.65   fcc_attach   102
+                 7.4.66   fcc_clear   102
+                 7.4.67   file_charset   103
+                 7.4.68   folder   103
+                 7.4.69   folder_format   103
+                 7.4.70   followup_to   104
+                 7.4.71   force_buffy_check   104
+                 7.4.72   force_name   105
+                 7.4.73   forward_decode   105
+                 7.4.74   forward_decrypt   105
+                 7.4.75   forward_edit   105
+                 7.4.76   forward_format   105
+                 7.4.77   forward_quote   106
+                 7.4.78   from   106
+                 7.4.79   gecos_mask   106
+                 7.4.80   hdrs   106
+                 7.4.81   header   107
+                 7.4.82   header_cache   107
+                 7.4.83   header_cache_compress   107
+                 7.4.84   help   107
+                 7.4.85   hidden_host   108
+                 7.4.86   hide_limited   108
+                 7.4.87   hide_missing   108
+                 7.4.88   hide_thread_subject   108
+                 7.4.89   hide_top_limited   108
+                 7.4.90   hide_top_missing   108
+                 7.4.91   history   109
+                 7.4.92   honor_followup_to   109
+                 7.4.93   hostname   109
+                 7.4.94   ignore_list_reply_to   109
+                 7.4.95   imap_authenticators   109
+                 7.4.96   imap_check_subscribed   110
+                 7.4.97   imap_delim_chars   110
+                 7.4.98   imap_headers   110
+                 7.4.99   imap_home_namespace   111
+                 7.4.100  imap_keepalive   111
+                 7.4.101  imap_list_subscribed   111
+                 7.4.102  imap_login   111
+                 7.4.103  imap_mail_check   112
+                 7.4.104  imap_pass   112
+                 7.4.105  imap_passive   112
+                 7.4.106  imap_peek   112
 
                                               v
 
-                 7.4.113  index_format   113
-                 7.4.114  ispell   115
-                 7.4.115  keep_flagged   116
-                 7.4.116  list_reply   116
-                 7.4.117  locale   116
-                 7.4.118  mail_check   116
-                 7.4.119  mailcap_path   116
-                 7.4.120  mailcap_sanitize   117
-                 7.4.121  maildir_header_cache_verify   117
-                 7.4.122  maildir_trash   117
-                 7.4.123  mark_old   117
-                 7.4.124  markers   118
-                 7.4.125  mask   118
-                 7.4.126  max_display_recips   118
-                 7.4.127  max_line_length   118
-                 7.4.128  mbox   118
-                 7.4.129  mbox_type   118
-                 7.4.130  menu_context   119
-                 7.4.131  menu_move_off   119
-                 7.4.132  menu_scroll   119
-                 7.4.133  message_format   119
-                 7.4.134  meta_key   119
-                 7.4.135  metoo   120
-                 7.4.136  mh_purge   120
-                 7.4.137  mh_seq_flagged   120
-                 7.4.138  mh_seq_replied   120
-                 7.4.139  mh_seq_unseen   120
-                 7.4.140  mime_forward   120
-                 7.4.141  mime_forward_decode   121
-                 7.4.142  mime_forward_rest   121
-                 7.4.143  mix_entry_format   121
-                 7.4.144  mixmaster   122
-                 7.4.145  move   122
-                 7.4.146  msgid_format   122
-                 7.4.147  narrow_tree   123
-                 7.4.148  nntp_ask_followup_to   123
-                 7.4.149  nntp_ask_x_comment_to   123
-                 7.4.150  nntp_cache_dir   124
-                 7.4.151  nntp_catchup   124
-                 7.4.152  nntp_context   124
-                 7.4.153  nntp_followup_to_poster   124
-                 7.4.154  nntp_group_index_format   125
-                 7.4.155  nntp_host   125
-                 7.4.156  nntp_inews   125
-                 7.4.157  nntp_load_description   126
-                 7.4.158  nntp_mail_check   126
-                 7.4.159  nntp_mime_subject   126
-                 7.4.160  nntp_newsrc   126
-                 7.4.161  nntp_pass   127
-                 7.4.162  nntp_post_moderated   127
-                 7.4.163  nntp_reconnect   127
-                 7.4.164  nntp_save_unsubscribed   127
-                 7.4.165  nntp_show_new_news   128
+                 7.4.107  imap_reconnect   113
+                 7.4.108  imap_servernoise   113
+                 7.4.109  imap_user   113
+                 7.4.110  implicit_autoview   113
+                 7.4.111  include   113
+                 7.4.112  include_onlyfirst   114
+                 7.4.113  indent_string   114
+                 7.4.114  index_format   114
+                 7.4.115  ispell   117
+                 7.4.116  keep_flagged   117
+                 7.4.117  list_reply   117
+                 7.4.118  locale   117
+                 7.4.119  mail_check   117
+                 7.4.120  mailcap_path   118
+                 7.4.121  mailcap_sanitize   118
+                 7.4.122  maildir_header_cache_verify   118
+                 7.4.123  maildir_trash   118
+                 7.4.124  mark_old   118
+                 7.4.125  markers   119
+                 7.4.126  mask   119
+                 7.4.127  max_display_recips   119
+                 7.4.128  max_line_length   119
+                 7.4.129  mbox   119
+                 7.4.130  mbox_type   120
+                 7.4.131  menu_context   120
+                 7.4.132  menu_move_off   120
+                 7.4.133  menu_scroll   120
+                 7.4.134  message_format   120
+                 7.4.135  meta_key   121
+                 7.4.136  metoo   121
+                 7.4.137  mh_purge   121
+                 7.4.138  mh_seq_flagged   121
+                 7.4.139  mh_seq_replied   121
+                 7.4.140  mh_seq_unseen   121
+                 7.4.141  mime_forward   122
+                 7.4.142  mime_forward_decode   122
+                 7.4.143  mime_forward_rest   122
+                 7.4.144  mix_entry_format   122
+                 7.4.145  mixmaster   123
+                 7.4.146  move   123
+                 7.4.147  msgid_format   123
+                 7.4.148  narrow_tree   124
+                 7.4.149  nntp_ask_followup_to   124
+                 7.4.150  nntp_ask_x_comment_to   124
+                 7.4.151  nntp_cache_dir   125
+                 7.4.152  nntp_catchup   125
+                 7.4.153  nntp_context   125
+                 7.4.154  nntp_followup_to_poster   125
+                 7.4.155  nntp_group_index_format   126
+                 7.4.156  nntp_host   126
+                 7.4.157  nntp_inews   126
+                 7.4.158  nntp_load_description   127
+                 7.4.159  nntp_mail_check   127
 
                                               vi
 
-                 7.4.166  nntp_show_only_unread   128
-                 7.4.167  nntp_user   128
-                 7.4.168  nntp_x_comment_to   128
-                 7.4.169  operating_system   128
-                 7.4.170  pager   129
-                 7.4.171  pager_context   129
-                 7.4.172  pager_format   129
-                 7.4.173  pager_index_lines   129
-                 7.4.174  pager_stop   130
-                 7.4.175  pgp_auto_decode   130
-                 7.4.176  pgp_autoinline   130
-                 7.4.177  pgp_check_exit   130
-                 7.4.178  pgp_clearsign_command   131
-                 7.4.179  pgp_decode_command   131
-                 7.4.180  pgp_decrypt_command   131
-                 7.4.181  pgp_encrypt_only_command   132
-                 7.4.182  pgp_encrypt_sign_command   132
-                 7.4.183  pgp_entry_format   132
-                 7.4.184  pgp_export_command   133
-                 7.4.185  pgp_getkeys_command   133
-                 7.4.186  pgp_good_sign   133
-                 7.4.187  pgp_ignore_subkeys   133
-                 7.4.188  pgp_import_command   133
-                 7.4.189  pgp_list_pubring_command   133
-                 7.4.190  pgp_list_secring_command   134
-                 7.4.191  pgp_long_ids   134
-                 7.4.192  pgp_mime_auto   134
-                 7.4.193  pgp_replyinline   134
-                 7.4.194  pgp_retainable_sigs   135
-                 7.4.195  pgp_show_unusable   135
-                 7.4.196  pgp_sign_as   135
-                 7.4.197  pgp_sign_command   135
-                 7.4.198  pgp_sort_keys   135
-                 7.4.199  pgp_strict_enc   136
-                 7.4.200  pgp_timeout   136
-                 7.4.201  pgp_use_gpg_agent   136
-                 7.4.202  pgp_verify_command   136
-                 7.4.203  pgp_verify_key_command   137
-                 7.4.204  pipe_decode   137
-                 7.4.205  pipe_sep   137
-                 7.4.206  pipe_split   137
-                 7.4.207  pop_auth_try_all   137
-                 7.4.208  pop_authenticators   138
-                 7.4.209  pop_delete   138
-                 7.4.210  pop_host   138
-                 7.4.211  pop_last   138
-                 7.4.212  pop_mail_check   139
-                 7.4.213  pop_pass   139
-                 7.4.214  pop_reconnect   139
-                 7.4.215  pop_user   139
-                 7.4.216  post_indent_string   139
-                 7.4.217  postpone   140
-                 7.4.218  postponed   140
+                 7.4.160  nntp_mime_subject   127
+                 7.4.161  nntp_newsrc   127
+                 7.4.162  nntp_pass   128
+                 7.4.163  nntp_post_moderated   128
+                 7.4.164  nntp_reconnect   128
+                 7.4.165  nntp_save_unsubscribed   129
+                 7.4.166  nntp_show_new_news   129
+                 7.4.167  nntp_show_only_unread   129
+                 7.4.168  nntp_user   129
+                 7.4.169  nntp_x_comment_to   129
+                 7.4.170  operating_system   130
+                 7.4.171  pager   130
+                 7.4.172  pager_context   130
+                 7.4.173  pager_format   130
+                 7.4.174  pager_index_lines   130
+                 7.4.175  pager_stop   131
+                 7.4.176  pgp_auto_decode   131
+                 7.4.177  pgp_autoinline   131
+                 7.4.178  pgp_check_exit   132
+                 7.4.179  pgp_clearsign_command   132
+                 7.4.180  pgp_decode_command   132
+                 7.4.181  pgp_decrypt_command   132
+                 7.4.182  pgp_encrypt_only_command   133
+                 7.4.183  pgp_encrypt_sign_command   133
+                 7.4.184  pgp_entry_format   133
+                 7.4.185  pgp_export_command   134
+                 7.4.186  pgp_getkeys_command   134
+                 7.4.187  pgp_good_sign   134
+                 7.4.188  pgp_ignore_subkeys   134
+                 7.4.189  pgp_import_command   134
+                 7.4.190  pgp_list_pubring_command   135
+                 7.4.191  pgp_list_secring_command   135
+                 7.4.192  pgp_long_ids   135
+                 7.4.193  pgp_mime_auto   135
+                 7.4.194  pgp_replyinline   135
+                 7.4.195  pgp_retainable_sigs   136
+                 7.4.196  pgp_show_unusable   136
+                 7.4.197  pgp_sign_as   136
+                 7.4.198  pgp_sign_command   136
+                 7.4.199  pgp_sort_keys   137
+                 7.4.200  pgp_strict_enc   137
+                 7.4.201  pgp_timeout   137
+                 7.4.202  pgp_use_gpg_agent   137
+                 7.4.203  pgp_verify_command   138
+                 7.4.204  pgp_verify_key_command   138
+                 7.4.205  pipe_decode   138
+                 7.4.206  pipe_sep   138
+                 7.4.207  pipe_split   138
+                 7.4.208  pop_auth_try_all   138
+                 7.4.209  pop_authenticators   139
+                 7.4.210  pop_delete   139
+                 7.4.211  pop_host   139
+                 7.4.212  pop_last   140
 
                                              vii
 
-                 7.4.219  preconnect   140
-                 7.4.220  print   140
-                 7.4.221  print_command   141
-                 7.4.222  print_decode   141
-                 7.4.223  print_split   141
-                 7.4.224  prompt_after   141
-                 7.4.225  query_command   141
-                 7.4.226  quit   142
-                 7.4.227  quote_empty   142
-                 7.4.228  quote_quoted   142
-                 7.4.229  quote_regexp   142
-                 7.4.230  read_inc   142
-                 7.4.231  read_only   143
-                 7.4.232  realname   143
-                 7.4.233  recall   143
-                 7.4.234  record   143
-                 7.4.235  reply_regexp   144
-                 7.4.236  reply_self   144
-                 7.4.237  reply_to   144
-                 7.4.238  resolve   144
-                 7.4.239  reverse_alias   144
-                 7.4.240  reverse_name   145
-                 7.4.241  reverse_realname   145
-                 7.4.242  rfc2047_parameters   145
-                 7.4.243  save_address   146
-                 7.4.244  save_empty   146
-                 7.4.245  save_name   146
-                 7.4.246  score   146
-                 7.4.247  score_threshold_delete   147
-                 7.4.248  score_threshold_flag   147
-                 7.4.249  score_threshold_read   147
-                 7.4.250  send_charset   147
-                 7.4.251  sendmail   147
-                 7.4.252  sendmail_wait   148
-                 7.4.253  shell   148
-                 7.4.254  sidebar_boundary   148
-                 7.4.255  sidebar_delim   148
-                 7.4.256  sidebar_newmail_only   149
-                 7.4.257  sidebar_number_format   149
-                 7.4.258  sidebar_shorten_hierarchy   149
-                 7.4.259  sidebar_visible   150
-                 7.4.260  sidebar_width   150
-                 7.4.261  sig_dashes   150
-                 7.4.262  sig_on_top   150
-                 7.4.263  signature   150
-                 7.4.264  signoff_string   151
-                 7.4.265  simple_search   151
-                 7.4.266  sleep_time   151
-                 7.4.267  smart_wrap   151
-                 7.4.268  smileys   152
-                 7.4.269  smime_ask_cert_label   152
-                 7.4.270  smime_ca_location   152
-                 7.4.271  smime_certificates   152
+                 7.4.213  pop_mail_check   140
+                 7.4.214  pop_pass   140
+                 7.4.215  pop_reconnect   140
+                 7.4.216  pop_user   140
+                 7.4.217  post_indent_string   141
+                 7.4.218  postpone   141
+                 7.4.219  postponed   141
+                 7.4.220  preconnect   141
+                 7.4.221  print   142
+                 7.4.222  print_command   142
+                 7.4.223  print_decode   142
+                 7.4.224  print_split   142
+                 7.4.225  prompt_after   142
+                 7.4.226  query_command   143
+                 7.4.227  quit   143
+                 7.4.228  quote_empty   143
+                 7.4.229  quote_quoted   143
+                 7.4.230  quote_regexp   143
+                 7.4.231  read_inc   144
+                 7.4.232  read_only   144
+                 7.4.233  realname   144
+                 7.4.234  recall   144
+                 7.4.235  record   144
+                 7.4.236  reply_regexp   145
+                 7.4.237  reply_self   145
+                 7.4.238  reply_to   145
+                 7.4.239  resolve   145
+                 7.4.240  reverse_alias   146
+                 7.4.241  reverse_name   146
+                 7.4.242  reverse_realname   146
+                 7.4.243  rfc2047_parameters   146
+                 7.4.244  save_address   147
+                 7.4.245  save_empty   147
+                 7.4.246  save_name   147
+                 7.4.247  score   148
+                 7.4.248  score_threshold_delete   148
+                 7.4.249  score_threshold_flag   148
+                 7.4.250  score_threshold_read   148
+                 7.4.251  send_charset   148
+                 7.4.252  sendmail   149
+                 7.4.253  sendmail_wait   149
+                 7.4.254  shell   149
+                 7.4.255  sidebar_boundary   149
+                 7.4.256  sidebar_delim   150
+                 7.4.257  sidebar_newmail_only   150
+                 7.4.258  sidebar_number_format   150
+                 7.4.259  sidebar_shorten_hierarchy   151
+                 7.4.260  sidebar_visible   151
+                 7.4.261  sidebar_width   151
+                 7.4.262  sig_dashes   151
+                 7.4.263  sig_on_top   151
+                 7.4.264  signature   152
+                 7.4.265  signoff_string   152
 
                                              viii
 
-                 7.4.272  smime_decrypt_command   152
-                 7.4.273  smime_decrypt_use_default_key   153
-                 7.4.274  smime_default_key   153
-                 7.4.275  smime_encrypt_command   153
-                 7.4.276  smime_encrypt_with   154
-                 7.4.277  smime_get_cert_command   154
-                 7.4.278  smime_get_cert_email_command   154
-                 7.4.279  smime_get_signer_cert_command   154
-                 7.4.280  smime_import_cert_command   154
-                 7.4.281  smime_is_default   154
-                 7.4.282  smime_keys   155
-                 7.4.283  smime_pk7out_command   155
-                 7.4.284  smime_sign_command   155
-                 7.4.285  smime_sign_opaque_command   155
-                 7.4.286  smime_timeout   156
-                 7.4.287  smime_verify_command   156
-                 7.4.288  smime_verify_opaque_command   156
-                 7.4.289  smtp_envelope   156
-                 7.4.290  smtp_host   156
-                 7.4.291  smtp_pass   157
-                 7.4.292  smtp_port   157
-                 7.4.293  smtp_use_tls   157
-                 7.4.294  smtp_user   157
-                 7.4.295  sort   158
-                 7.4.296  sort_alias   158
-                 7.4.297  sort_aux   158
-                 7.4.298  sort_browser   159
-                 7.4.299  sort_re   159
-                 7.4.300  spam_separator   159
-                 7.4.301  spoolfile   160
-                 7.4.302  ssl_ca_certificates_file   160
-                 7.4.303  ssl_client_cert   160
-                 7.4.304  ssl_force_tls   160
-                 7.4.305  ssl_min_dh_prime_bits   160
-                 7.4.306  ssl_starttls   161
-                 7.4.307  ssl_use_sslv2   161
-                 7.4.308  ssl_use_sslv3   161
-                 7.4.309  ssl_use_tlsv1   161
-                 7.4.310  ssl_usesystemcerts   161
-                 7.4.311  status_chars   162
-                 7.4.312  status_format   162
-                 7.4.313  status_on_top   164
-                 7.4.314  strict_mailto   164
-                 7.4.315  strict_mime   165
-                 7.4.316  strict_threads   165
-                 7.4.317  strip_was   165
-                 7.4.318  strip_was_regex   165
-                 7.4.319  stuff_quoted   166
-                 7.4.320  suspend   166
-                 7.4.321  text_flowed   166
-                 7.4.322  thorough_search   166
-                 7.4.323  thread_received   166
-                 7.4.324  tilde   167
+                 7.4.266  simple_search   152
+                 7.4.267  sleep_time   152
+                 7.4.268  smart_wrap   153
+                 7.4.269  smileys   153
+                 7.4.270  smime_ask_cert_label   153
+                 7.4.271  smime_ca_location   153
+                 7.4.272  smime_certificates   153
+                 7.4.273  smime_decrypt_command   154
+                 7.4.274  smime_decrypt_use_default_key   154
+                 7.4.275  smime_default_key   154
+                 7.4.276  smime_encrypt_command   155
+                 7.4.277  smime_encrypt_with   155
+                 7.4.278  smime_get_cert_command   155
+                 7.4.279  smime_get_cert_email_command   155
+                 7.4.280  smime_get_signer_cert_command   155
+                 7.4.281  smime_import_cert_command   156
+                 7.4.282  smime_is_default   156
+                 7.4.283  smime_keys   156
+                 7.4.284  smime_pk7out_command   156
+                 7.4.285  smime_sign_command   156
+                 7.4.286  smime_sign_opaque_command   157
+                 7.4.287  smime_timeout   157
+                 7.4.288  smime_verify_command   157
+                 7.4.289  smime_verify_opaque_command   157
+                 7.4.290  smtp_envelope   157
+                 7.4.291  smtp_host   157
+                 7.4.292  smtp_pass   158
+                 7.4.293  smtp_port   158
+                 7.4.294  smtp_use_tls   158
+                 7.4.295  smtp_user   159
+                 7.4.296  sort   159
+                 7.4.297  sort_alias   159
+                 7.4.298  sort_aux   159
+                 7.4.299  sort_browser   160
+                 7.4.300  sort_re   160
+                 7.4.301  spam_separator   161
+                 7.4.302  spoolfile   161
+                 7.4.303  ssl_ca_certificates_file   161
+                 7.4.304  ssl_client_cert   161
+                 7.4.305  ssl_force_tls   161
+                 7.4.306  ssl_min_dh_prime_bits   162
+                 7.4.307  ssl_starttls   162
+                 7.4.308  ssl_use_sslv2   162
+                 7.4.309  ssl_use_sslv3   162
+                 7.4.310  ssl_use_tlsv1   162
+                 7.4.311  ssl_usesystemcerts   163
+                 7.4.312  status_chars   163
+                 7.4.313  status_format   163
+                 7.4.314  status_on_top   165
+                 7.4.315  strict_mailto   166
+                 7.4.316  strict_mime   166
+                 7.4.317  strict_threads   166
+                 7.4.318  strip_was   166
 
                                               ix
 
-                 7.4.325  timeout   167
-                 7.4.326  tmpdir   167
-                 7.4.327  to_chars   167
-                 7.4.328  trash   167
-                 7.4.329  tunnel   168
-                 7.4.330  umask   168
-                 7.4.331  uncollapse_jump   168
-                 7.4.332  use_8bitmime   168
-                 7.4.333  use_domain   168
-                 7.4.334  use_from   169
-                 7.4.335  use_idn   169
-                 7.4.336  use_ipv6   169
-                 7.4.337  user_agent   169
-                 7.4.338  visual   169
-                 7.4.339  wait_key   170
-                 7.4.340  weed   170
-                 7.4.341  wrap_search   170
-                 7.4.342  wrapmargin   170
-                 7.4.343  write_bcc   170
-                 7.4.344  write_inc   171
-                 7.4.345  xterm_icon   171
-                 7.4.346  xterm_leave   171
-                 7.4.347  xterm_set_titles   171
-                 7.4.348  xterm_title   171
-           7.5   Functions ....................................................... 172
-                 7.5.1    generic   172
-                 7.5.2    index   173
-                 7.5.3    pager   175
-                 7.5.4    alias   177
-                 7.5.5    query   177
-                 7.5.6    attach   177
-                 7.5.7    compose   178
-                 7.5.8    postpone   179
-                 7.5.9    browser   179
-                 7.5.10   pgp   180
-                 7.5.11   editor   180
-
-       8.  Miscellany ............................................................ 180
-           8.1   Acknowledgments ................................................. 181
-           8.2   About this document ............................................. 183
+                 7.4.319  strip_was_regex   167
+                 7.4.320  stuff_quoted   167
+                 7.4.321  suspend   167
+                 7.4.322  text_flowed   167
+                 7.4.323  thorough_search   167
+                 7.4.324  thread_received   168
+                 7.4.325  tilde   168
+                 7.4.326  timeout   168
+                 7.4.327  tmpdir   168
+                 7.4.328  to_chars   168
+                 7.4.329  trash   169
+                 7.4.330  tunnel   169
+                 7.4.331  umask   169
+                 7.4.332  uncollapse_jump   169
+                 7.4.333  use_8bitmime   169
+                 7.4.334  use_domain   170
+                 7.4.335  use_from   170
+                 7.4.336  use_idn   170
+                 7.4.337  use_ipv6   170
+                 7.4.338  visual   170
+                 7.4.339  wait_key   171
+                 7.4.340  weed   171
+                 7.4.341  wrap_search   171
+                 7.4.342  wrapmargin   171
+                 7.4.343  write_bcc   171
+                 7.4.344  write_inc   172
+                 7.4.345  xterm_icon   172
+                 7.4.346  xterm_leave   172
+                 7.4.347  xterm_set_titles   172
+                 7.4.348  xterm_title   172
+           7.5   Functions ....................................................... 173
+                 7.5.1    generic   173
+                 7.5.2    index   174
+                 7.5.3    pager   176
+                 7.5.4    alias   178
+                 7.5.5    query   178
+                 7.5.6    attach   178
+                 7.5.7    compose   179
+                 7.5.8    postpone   180
+                 7.5.9    browser   180
+                 7.5.10   pgp   181
+                 7.5.11   editor   181
+
+       8.  Miscellany ............................................................ 181
+           8.1   Acknowledgments ................................................. 182
+           8.2   About this document ............................................. 184
 
                                               x
 
diff --git a/doc/mutt.man b/doc/mutt.man
index 0aaf193..cb93cf7 100644
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -38,7 +38,7 @@ mutt-ng \- The Mutt-ng Mail User Agent
 [-c \fIaddr\fP] \fIaddr\fP [...]
 .PP
 .B muttng
-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -D
+[-n] [-e \fIcmd\fP] [-F \fIfile\fP] [-t | -T]
 .PP
 .B muttng
 [-n] [-e \fIcmd\fP] [-F \fIfile\fP] -p
@@ -66,8 +66,10 @@ Attach a file to your message using MIME.
 Specify a blind-carbon-copy (BCC) recipient
 .IP "-c \fIaddress\fP"
 Specify a carbon-copy (CC) recipient
-.IP "-D"
+.IP "-t"
 Print the value of all variables to stdout.
+.IP "-T"
+Print the value of all changed variables to stdout.
 .IP "-e \fIcommand\fP"
 Specify a configuration command to be run after processing of initialization
 files.
diff --git a/hash.c b/hash.c
index cb2cf2e..72225be 100644
--- a/hash.c
+++ b/hash.c
@@ -168,3 +168,17 @@ void hash_destroy (HASH ** ptr, void (*destroy) (void *))
   mem_free (&pptr->table);
   mem_free (ptr);
 }
+
+void hash_map (HASH* table, void (*mapfunc) (const char* key, void* data,
+                                             unsigned long more),
+               unsigned long more) {
+  int i = 0;
+  struct hash_elem* elem = NULL;
+
+  if (!table || !mapfunc)
+    return;
+
+  for (i = 0; i < table->nelem; i++)
+    for (elem = table->table[i]; elem; elem = elem->next)
+      mapfunc (elem->key, elem->data, more);
+}
diff --git a/hash.h b/hash.h
index abfb307..1a4f985 100644
--- a/hash.h
+++ b/hash.h
@@ -34,4 +34,8 @@ void hash_delete_hash (HASH * table, int hash, const char *key,
                        const void *data, void (*destroy) (void *));
 void hash_destroy (HASH ** hash, void (*destroy) (void *));
 
+void hash_map (HASH* table,
+               void (*mapfunc) (const char* key, void* data, unsigned long more),
+               unsigned long more);
+
 #endif
diff --git a/init.c b/init.c
index dad19c8..e59984e 100644
--- a/init.c
+++ b/init.c
@@ -2,6 +2,9 @@
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  *
+ * Parts were written/modified by:
+ * Rocco Rutte <pdmef@cs.tu-berlin.de>
+ *
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
@@ -20,6 +23,7 @@
 #include "keymap.h"
 #include "mbyte.h"
 #include "charset.h"
+#include "thread.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
@@ -52,15 +56,19 @@
 /*
  * prototypes
  */
-static int mutt_option_index (char*);
-static const struct mapping_t* get_sortmap (int idx);
+static const struct mapping_t* get_sortmap (struct option_t* option);
+static int parse_sort (struct option_t* dst, const char *s,
+                       const struct mapping_t *map,
+                       char* errbuf, size_t errlen);
+
+static HASH* ConfigOptions = NULL;
 
 /* for synonym warning reports: synonym found during parsing */
 typedef struct {
-  char* f;      /* file */
-  int l;        /* line */
-  int n;        /* new name (index) */
-  int o;        /* old name (index) */
+  char* f;              /* file */
+  int l;                /* line */
+  struct option_t* n;   /* new */
+  struct option_t* o;   /* old */
 } syn_t;
 
 /* for synonym warning reports: list of synonyms found */
@@ -221,7 +229,7 @@ int mutt_option_value (const char* val, char* dst, size_t dstlen) {
 }
 
 /* for synonym warning reports: adds synonym to end of list */
-static void syn_add (int n, int o) {
+static void syn_add (struct option_t* n, struct option_t* o) {
   syn_t* tmp = mem_malloc (sizeof (syn_t));
   tmp->f = str_dup (CurRCFile);
   tmp->l = CurRCLine;
@@ -279,22 +287,6 @@ int query_quadoption (int opt, const char *prompt)
   /* not reached */
 }
 
-/* given the variable ``s'', return the index into the rc_vars array which
-   matches, or -1 if the variable is not found.  */
-static int mutt_option_index (char *s)
-{
-  int i;
-
-  for (i = 0; MuttVars[i].option; i++)
-    if (str_cmp (s, MuttVars[i].option) == 0) {
-      if (MuttVars[i].type == DT_SYN)
-        syn_add (mutt_option_index ((char *) MuttVars[i].data), i);
-      return (MuttVars[i].type ==
-              DT_SYN ? mutt_option_index ((char *) MuttVars[i].data) : i);
-    }
-  return (-1);
-}
-
 static void add_to_list (LIST ** list, const char *str)
 {
   LIST *t, *last = NULL;
@@ -499,12 +491,15 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
 {
   int i, j, res = 0;
   BUFFER token;
+  struct option_t* option = NULL;
 
   memset (&token, 0, sizeof (token));
   mutt_extract_token (tmp, s, 0);
 
   /* is the item defined as a variable or a function? */
-  if (!(res = (mutt_option_index (tmp->data) != -1)))
+  if ((option = hash_find (ConfigOptions, tmp->data)))
+    res = 1;
+  else {
     for (i = 0; !res && i < MENU_MAX; i++) {
       struct binding_t *b = km_get_table (Menus[i].value);
 
@@ -518,6 +513,7 @@ static int parse_ifdef (BUFFER * tmp, BUFFER * s, unsigned long data,
           break;
         }
     }
+  }
   /* check for feature_* */
   if (!res) {
     char *p = NULL;
@@ -990,9 +986,8 @@ static int parse_my_hdr (BUFFER * buf, BUFFER * s, unsigned long data,
 }
 
 static int
-parse_sort (short *val, const char *s, const struct mapping_t *map,
-            BUFFER * err)
-{
+parse_sort (struct option_t* dst, const char *s, const struct mapping_t *map,
+            char* errbuf, size_t errlen) {
   int i, flags = 0;
 
   if (str_ncmp ("reverse-", s, 8) == 0) {
@@ -1006,148 +1001,85 @@ parse_sort (short *val, const char *s, const struct mapping_t *map,
   }
 
   if ((i = mutt_getvaluebyname (s, map)) == -1) {
-    snprintf (err->data, err->dsize, _("%s: unknown sorting method"), s);
+    if (errbuf)
+      snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), s, dst->option);
     return (-1);
   }
 
-  *val = i | flags;
-
+  *((short*) dst->data) = i | flags;
   return 0;
 }
 
-static void mutt_set_default (struct option_t *p)
-{
-  switch (p->type & DT_MASK) {
-  case DT_STR:
-    if (!p->init && *((char **) p->data))
-      p->init = (unsigned long) str_dup (*((char **) p->data));
-    break;
-  case DT_PATH:
-    if (!p->init && *((char **) p->data)) {
-      char *cp = str_dup (*((char **) p->data));
-
-      /* mutt_pretty_mailbox (cp); */
-      p->init = (unsigned long) cp;
-    }
-    break;
-  case DT_ADDR:
-    if (!p->init && *((ADDRESS **) p->data)) {
-      char tmp[HUGE_STRING];
+/* if additional data more == 1, we want to resolve synonyms */
+static void mutt_set_default (const char* name, void* p, unsigned long more) {
+  char buf[LONG_STRING];
+  struct option_t* ptr = (struct option_t*) p;
 
-      *tmp = '\0';
-      rfc822_write_address (tmp, sizeof (tmp), *((ADDRESS **) p->data), 0);
-      p->init = (unsigned long) str_dup (tmp);
-    }
-    break;
-  case DT_RX:
-    {
-      rx_t* pp = (rx_t*) p->data;
-
-      if (!p->init && pp->pattern)
-        p->init = (unsigned long) str_dup (pp->pattern);
-      break;
-    }
+  if (DTYPE (ptr->type) == DT_SYN) {
+    if (!more)
+      return;
+    ptr = hash_find (ConfigOptions, (char*) ptr->data);
   }
+  if (!ptr || *ptr->init)
+    return;
+  mutt_option_value (ptr->option, buf, sizeof (buf));
+  if (str_len (ptr->init) == 0 && buf && *buf)
+    ptr->init = str_dup (buf);
 }
 
-static void mutt_restore_default (struct option_t *p)
-{
-  switch (p->type & DT_MASK) {
-  case DT_STR:
-    if (p->init)
-      str_replace ((char **) p->data, (char *) p->init);
-    break;
-  case DT_PATH:
-    if (p->init) {
-      char path[_POSIX_PATH_MAX];
-
-      strfcpy (path, (char *) p->init, sizeof (path));
-      mutt_expand_path (path, sizeof (path));
-      str_replace ((char **) p->data, path);
-    }
-    break;
-  case DT_ADDR:
-    if (p->init) {
-      rfc822_free_address ((ADDRESS **) p->data);
-      *((ADDRESS **) p->data) = rfc822_parse_adrlist (NULL, (char *) p->init);
-    }
-    break;
-  case DT_BOOL:
-    if (p->init)
-      set_option (p->data);
-    else
-      unset_option (p->data);
-    break;
-  case DT_QUAD:
-    set_quadoption (p->data, p->init);
-    break;
-  case DT_NUM:
-  case DT_SORT:
-  case DT_MAGIC:
-    *((short *) p->data) = p->init;
-    break;
-  case DT_RX:
-    {
-      rx_t *pp = (rx_t *) p->data;
-      int flags = 0;
-
-      mem_free (&pp->pattern);
-      if (pp->rx) {
-        regfree (pp->rx);
-        mem_free (&pp->rx);
-      }
-
-      if (p->init) {
-        char *s = (char *) p->init;
+/* if additional data more == 1, we want to resolve synonyms */
+static void mutt_restore_default (const char* name, void* p, unsigned long more) {
+  char errbuf[STRING];
+  struct option_t* ptr = (struct option_t*) p;
 
-        pp->rx = mem_calloc (1, sizeof (regex_t));
-        if (str_cmp (p->option, "mask") != 0)
-          flags |= mutt_which_case ((const char *) p->init);
-        if (str_cmp (p->option, "mask") == 0 && *s == '!') {
-          s++;
-          pp->not = 1;
-        }
-        if (REGCOMP (pp->rx, s, flags) != 0) {
-          fprintf (stderr,
-                   _("mutt_restore_default(%s): error in regexp: %s\n"),
-                   p->option, pp->pattern);
-          mem_free (&pp->pattern);
-          regfree (pp->rx);
-          mem_free (&pp->rx);
-        }
-        else
-          str_replace (&pp->pattern, (char *) p->init);
-      }
-    }
-    break;
+  if (DTYPE (ptr->type) == DT_SYN) {
+    if (!more)
+      return;
+    ptr = hash_find (ConfigOptions, (char*) ptr->data);
+  }
+  if (!ptr)
+    return;
+  if (FuncTable[DTYPE (ptr->type)].opt_from_string (ptr, ptr->init, errbuf,
+                                                    sizeof (errbuf)) < 0) {
+    mutt_endwin (NULL);
+    fprintf (stderr, _("Invalid default setting found. Please report this "
+                       "error:\n\"%s\"\n"), errbuf);
+    exit (1);
   }
 
-  if (p->flags & R_INDEX)
+  if (ptr->flags & R_INDEX)
     set_option (OPTFORCEREDRAWINDEX);
-  if (p->flags & R_PAGER)
+  if (ptr->flags & R_PAGER)
     set_option (OPTFORCEREDRAWPAGER);
-  if (p->flags & R_RESORT_SUB)
+  if (ptr->flags & R_RESORT_SUB)
     set_option (OPTSORTSUBTHREADS);
-  if (p->flags & R_RESORT)
+  if (ptr->flags & R_RESORT)
     set_option (OPTNEEDRESORT);
-  if (p->flags & R_RESORT_INIT)
+  if (ptr->flags & R_RESORT_INIT)
     set_option (OPTRESORTINIT);
-  if (p->flags & R_TREE)
+  if (ptr->flags & R_TREE)
     set_option (OPTREDRAWTREE);
 }
 
 /* check whether value for $dsn_return would be valid */
-static int check_dsn_return (const char* val) {
+static int check_dsn_return (const char* option, unsigned long p,
+                             char* errbuf, size_t errlen) {
+  char* val = (char*) p;
   if (val && *val && str_ncmp (val, "hdrs", 4) != 0 &&
-      str_ncmp (val, "full", 4) != 0)
+      str_ncmp (val, "full", 4) != 0) {
+    if (errbuf)
+      snprintf (errbuf, errlen, _("'%s' is invalid for $%s"), val, "dsn_return");
     return (0);
+  }
   return (1);
 }
 
 /* check whether value for $dsn_notify would be valid */
-static int check_dsn_notify (const char* val) {
+static int check_dsn_notify (const char* option, unsigned long p,
+                             char* errbuf, size_t errlen) {
   list2_t* list = NULL;
   int i = 0, rc = 1;
+  char* val = (char*) p;
 
   if (!val || !*val)
     return (1);
@@ -1160,6 +1092,9 @@ static int check_dsn_notify (const char* val) {
         str_ncmp (list->data[i], "failure", 7) != 0 &&
         str_ncmp (list->data[i], "delay", 5) != 0 &&
         str_ncmp (list->data[i], "success", 7) != 0) {
+      if (errbuf)
+        snprintf (errbuf, errlen, _("'%s' is invalid for $%s"),
+                  (char*) list->data[i], "dsn_notify");
       rc = 0;
       break;
     }
@@ -1167,20 +1102,41 @@ static int check_dsn_notify (const char* val) {
   return (rc);
 }
 
-static int check_special (const char* name, const char* val) {
+static int check_num (const char* option, unsigned long p,
+                      char* errbuf, size_t errlen) {
+  if ((int) p < 0) {
+    if (errbuf)
+      snprintf (errbuf, errlen, _("'%d' is invalid for $%s"), (int) p, option);
+    return (0);
+  }
+  return (1);
+}
+
+static int check_history (const char* option, unsigned long p,
+                          char* errbuf, size_t errlen) {
+  if (!check_num ("history", p, errbuf, errlen))
+    return (0);
+  mutt_init_history ();
+  return (1);
+}
+
+static int check_special (const char* name, unsigned long val,
+                          char* errbuf, size_t errlen) {
   int i = 0;
 
   for (i = 0; SpecialVars[i].name; i++) {
-    if (str_cmp (SpecialVars[i].name, name) == 0)
-      return (SpecialVars[i].check (val));
+    if (str_cmp (SpecialVars[i].name, name) == 0) {
+      return (SpecialVars[i].check (SpecialVars[i].name,
+                                    val, errbuf, errlen));
+    }
   }
   return (1);
 }
 
-static const struct mapping_t* get_sortmap (int idx) {
+static const struct mapping_t* get_sortmap (struct option_t* option) {
   const struct mapping_t* map = NULL;
 
-  switch (MuttVars[idx].type & DT_SUBTYPE_MASK) {
+  switch (option->type & DT_SUBTYPE_MASK) {
   case DT_SORT_ALIAS:
     map = SortAliasMethods;
     break;
@@ -1201,11 +1157,19 @@ static const struct mapping_t* get_sortmap (int idx) {
   return (map);
 }
 
+/* creates new option_t* of type DT_USER for $user_ var */
+static struct option_t* add_user_option (const char* name) {
+  struct option_t* option = mem_calloc (1, sizeof (struct option_t));
+  option->option = str_dup (name);
+  option->type = DT_USER;
+  return (option);
+}
+
 static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
                       BUFFER * err)
 {
-  int idx, query, unset, inv, reset, r = 0;
-  char *p, scratch[_POSIX_PATH_MAX];
+  int query, unset, inv, reset, r = 0;
+  struct option_t* option = NULL;
 
   while (MoreArgs (s)) {
     /* reset state variables */
@@ -1234,8 +1198,23 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
     /* get the variable name */
     mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
 
-    if ((idx = mutt_option_index (tmp->data)) == -1 &&
-        !(reset && !str_cmp ("all", tmp->data))) {
+    /* resolve synonyms */
+    if ((option = hash_find (ConfigOptions, tmp->data)) != NULL && 
+        DTYPE (option->type == DT_SYN)) {
+      struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
+      syn_add (newopt, option);
+      option = newopt;
+    }
+
+    /* see if we need to add $user_ var */
+    if (!option && !reset && !unset && 
+        ascii_strncasecmp ("user_", tmp->data, 5) == 0) {
+      debug_print (1, ("adding user option '%s'\n", tmp->data));
+      option = add_user_option (tmp->data);
+      hash_insert (ConfigOptions, option->option, option, 0);
+    }
+
+    if (!option && !(reset && str_cmp ("all", tmp->data) == 0)) {
       snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
       return (-1);
     }
@@ -1253,14 +1232,15 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
 
       if (!str_cmp ("all", tmp->data)) {
-        for (idx = 0; MuttVars[idx].option; idx++)
-          mutt_restore_default (&MuttVars[idx]);
-        return 0;
+        hash_map (ConfigOptions, mutt_restore_default, 1);
+        return (0);
       }
       else
-        mutt_restore_default (&MuttVars[idx]);
+        mutt_restore_default (NULL, option, 1);
     }
-    else if (DTYPE (MuttVars[idx].type) == DT_BOOL) {
+    else if (DTYPE (option->type) == DT_BOOL) {
+      /* XXX this currently ignores the function table
+       * as we don't get invert and stuff into it */
       if (s && *s->dptr == '=') {
         if (unset || inv || query) {
           snprintf (err->data, err->dsize, "Usage: set variable=yes|no");
@@ -1280,197 +1260,59 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
       }
 
       if (query) {
-        bool_to_string (err->data, err->dsize, idx);
+        bool_to_string (err->data, err->dsize, option);
         return 0;
       }
 
       if (unset)
-        unset_option (MuttVars[idx].data);
+        unset_option (option->data);
       else if (inv)
-        toggle_option (MuttVars[idx].data);
+        toggle_option (option->data);
       else
-        set_option (MuttVars[idx].data);
+        set_option (option->data);
     }
-    else if (DTYPE (MuttVars[idx].type) == DT_STR ||
-             DTYPE (MuttVars[idx].type) == DT_PATH ||
-             DTYPE (MuttVars[idx].type) == DT_ADDR) {
-      if (unset) {
-        if (DTYPE (MuttVars[idx].type) == DT_ADDR)
-          rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
-        else
-          mem_free ((void *) MuttVars[idx].data);
-      }
-      else if (query || *s->dptr != '=') {
-        FuncTable[DTYPE (MuttVars[idx].type)].opt_to_string (err->data, err->dsize, idx);
-        break;
-      }
-      else {
-        s->dptr++;
-
-        /* copy the value of the string */
-        if (DTYPE (MuttVars[idx].type) == DT_ADDR)
-          rfc822_free_address ((ADDRESS **) MuttVars[idx].data);
-        else
-          mem_free ((void *) MuttVars[idx].data);
-
-        mutt_extract_token (tmp, s, 0);
-        if (DTYPE (MuttVars[idx].type) == DT_PATH) {
-          strfcpy (scratch, tmp->data, sizeof (scratch));
-          mutt_expand_path (scratch, sizeof (scratch));
-          *((char **) MuttVars[idx].data) = str_dup (scratch);
-        }
-        else if (DTYPE (MuttVars[idx].type) == DT_STR) {
-          /* see if the value may only be a certain value... */
-          if (check_special (MuttVars[idx].option, tmp->data)) {
-            *((char **) MuttVars[idx].data) = str_dup (tmp->data);
-            if (str_cmp (MuttVars[idx].option, "charset") == 0)
-              mutt_set_charset (Charset);
-          } else {
-            /* ... and abort if it fails */
-            snprintf (err->data, err->dsize, "'%s' is invalid for $%s",
-                      tmp->data, MuttVars[idx].option);
-            return (-1);
-          }
-        }
-        else {
-          *((ADDRESS **) MuttVars[idx].data) =
-            rfc822_parse_adrlist (NULL, tmp->data);
-        }
-      }
-    }
-    else if (DTYPE (MuttVars[idx].type) == DT_RX) {
-      rx_t *ptr = (rx_t *) MuttVars[idx].data;
-      regex_t *rx;
-      int e, flags = 0;
-
-      if (query || *s->dptr != '=') {
-        rx_to_string (err->data, err->dsize, idx);
-        break;
-      }
-
-      if (option (OPTATTACHMSG)
-          && !str_cmp (MuttVars[idx].option, "reply_regexp")) {
-        snprintf (err->data, err->dsize,
-                  "Operation not permitted when in attach-message mode.");
-        r = -1;
-        break;
-      }
-
-      s->dptr++;
-
-      /* copy the value of the string */
-      mutt_extract_token (tmp, s, 0);
-
-      if (!ptr->pattern || str_cmp (ptr->pattern, tmp->data) != 0) {
-        int not = 0;
-
-        /* $mask is case-sensitive */
-        if (str_cmp (MuttVars[idx].option, "mask") != 0)
-          flags |= mutt_which_case (tmp->data);
-
-        p = tmp->data;
-        if (str_cmp (MuttVars[idx].option, "mask") == 0) {
-          if (*p == '!') {
-            not = 1;
-            p++;
-          }
-        }
-
-        rx = (regex_t *) mem_malloc (sizeof (regex_t));
-        if ((e = REGCOMP (rx, p, flags)) != 0) {
-          regerror (e, rx, err->data, err->dsize);
-          regfree (rx);
-          mem_free (&rx);
+    else if (DTYPE (option->type) == DT_STR ||
+             DTYPE (option->type) == DT_PATH ||
+             DTYPE (option->type) == DT_ADDR ||
+             DTYPE (option->type) == DT_MAGIC ||
+             DTYPE (option->type) == DT_NUM ||
+             DTYPE (option->type) == DT_SORT ||
+             DTYPE (option->type) == DT_RX ||
+             DTYPE (option->type) == DT_USER) {
+
+      /* XXX maybe we need to get unset into handlers? */
+      if (DTYPE (option->type) == DT_STR ||
+          DTYPE (option->type) == DT_PATH ||
+          DTYPE (option->type) == DT_ADDR ||
+          DTYPE (option->type) == DT_USER) {
+        if (unset) {
+          if (DTYPE (option->type) == DT_ADDR)
+            rfc822_free_address ((ADDRESS **) option->data);
+          else if (DTYPE (option->type == DT_USER)) {
+            void* p = (void*) option->data;
+            mem_free (&p);
+          } else
+            mem_free ((void *) option->data);
           break;
         }
-
-        /* get here only if everything went smootly */
-        if (ptr->pattern) {
-          mem_free (&ptr->pattern);
-          regfree ((regex_t *) ptr->rx);
-          mem_free (&ptr->rx);
-        }
-
-        ptr->pattern = str_dup (tmp->data);
-        ptr->rx = rx;
-        ptr->not = not;
-
-        /* $reply_regexp and $alterantes require special treatment */
-
-        if (Context && Context->msgcount &&
-            str_cmp (MuttVars[idx].option, "reply_regexp") == 0) {
-          regmatch_t pmatch[1];
-          int i;
-
-#define CUR_ENV Context->hdrs[i]->env
-          for (i = 0; i < Context->msgcount; i++) {
-            if (CUR_ENV && CUR_ENV->subject) {
-              CUR_ENV->real_subj = (regexec (ReplyRegexp.rx,
-                                             CUR_ENV->subject, 1, pmatch,
-                                             0)) ? CUR_ENV->
-                subject : CUR_ENV->subject + pmatch[0].rm_eo;
-            }
-          }
-#undef CUR_ENV
-        }
-      }
-    }
-    else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
-
-      if (query || *s->dptr != '=') {
-        magic_to_string (err->data, err->dsize, idx);
-        break;
       }
 
-      s->dptr++;
-
-      /* copy the value of the string */
-      mutt_extract_token (tmp, s, 0);
-      if (mx_set_magic (tmp->data)) {
-        snprintf (err->data, err->dsize, _("%s: invalid mailbox type"),
-                  tmp->data);
-        r = -1;
-        break;
-      }
-    }
-    else if (DTYPE (MuttVars[idx].type) == DT_NUM) {
-      short *ptr = (short *) MuttVars[idx].data;
-      int val;
-      char *t;
-
       if (query || *s->dptr != '=') {
-        num_to_string (err->data, err->dsize, idx);
+        FuncTable[DTYPE (option->type)].opt_to_string
+          (err->data, err->dsize, option);
         break;
       }
 
       s->dptr++;
-
       mutt_extract_token (tmp, s, 0);
-      val = strtol (tmp->data, &t, 0);
-
-      if (!*tmp->data || *t || (short) val != val) {
-        snprintf (err->data, err->dsize, _("%s: invalid value"), tmp->data);
+      if (!FuncTable[DTYPE (option->type)].opt_from_string
+          (option, tmp->data, err->data, err->dsize))
         r = -1;
-        break;
-      }
-      else
-        *ptr = (short) val;
-
-      /* these ones need a sanity check */
-      if (str_cmp (MuttVars[idx].option, "history") == 0) {
-        if (*ptr < 0)
-          *ptr = 0;
-        mutt_init_history ();
-      }
-      else if (str_cmp (MuttVars[idx].option, "pager_index_lines") == 0) {
-        if (*ptr < 0)
-          *ptr = 0;
-      }
     }
-    else if (DTYPE (MuttVars[idx].type) == DT_QUAD) {
+    else if (DTYPE (option->type) == DT_QUAD) {
 
       if (query) {
-        quad_to_string (err->data, err->dsize, idx);
+        quad_to_string (err->data, err->dsize, option);
         break;
       }
 
@@ -1478,71 +1320,47 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
         s->dptr++;
         mutt_extract_token (tmp, s, 0);
         if (ascii_strcasecmp ("yes", tmp->data) == 0)
-          set_quadoption (MuttVars[idx].data, M_YES);
+          set_quadoption (option->data, M_YES);
         else if (ascii_strcasecmp ("no", tmp->data) == 0)
-          set_quadoption (MuttVars[idx].data, M_NO);
+          set_quadoption (option->data, M_NO);
         else if (ascii_strcasecmp ("ask-yes", tmp->data) == 0)
-          set_quadoption (MuttVars[idx].data, M_ASKYES);
+          set_quadoption (option->data, M_ASKYES);
         else if (ascii_strcasecmp ("ask-no", tmp->data) == 0)
-          set_quadoption (MuttVars[idx].data, M_ASKNO);
+          set_quadoption (option->data, M_ASKNO);
         else {
-          snprintf (err->data, err->dsize, _("%s: invalid value"), tmp->data);
+          snprintf (err->data, err->dsize, _("'%s' is invalid for $%s\n"),
+                    tmp->data, option->option);
           r = -1;
           break;
         }
       }
       else {
         if (inv)
-          toggle_quadoption (MuttVars[idx].data);
+          toggle_quadoption (option->data);
         else if (unset)
-          set_quadoption (MuttVars[idx].data, M_NO);
+          set_quadoption (option->data, M_NO);
         else
-          set_quadoption (MuttVars[idx].data, M_YES);
-      }
-    }
-    else if (DTYPE (MuttVars[idx].type) == DT_SORT) {
-      const struct mapping_t *map = NULL;
-
-      if (query || *s->dptr != '=') {
-        sort_to_string (err->data, err->dsize, idx);
-        return 0;
-      }
-
-      /* do this here so we don't ordinarily do it twice for queries */
-      if (!(map = get_sortmap (idx))) {
-        snprintf (err->data, err->dsize, _("%s: Unknown type."),
-                  MuttVars[idx].option);
-        r = -1;
-        break;
-      }
-
-      s->dptr++;
-      mutt_extract_token (tmp, s, 0);
-
-      if (parse_sort ((short *) MuttVars[idx].data, tmp->data, map, err) ==
-          -1) {
-        r = -1;
-        break;
+          set_quadoption (option->data, M_YES);
       }
     }
     else {
       snprintf (err->data, err->dsize, _("%s: unknown type"),
-                MuttVars[idx].option);
+                option->option);
       r = -1;
       break;
     }
 
-    if (MuttVars[idx].flags & R_INDEX)
+    if (option->flags & R_INDEX)
       set_option (OPTFORCEREDRAWINDEX);
-    if (MuttVars[idx].flags & R_PAGER)
+    if (option->flags & R_PAGER)
       set_option (OPTFORCEREDRAWPAGER);
-    if (MuttVars[idx].flags & R_RESORT_SUB)
+    if (option->flags & R_RESORT_SUB)
       set_option (OPTSORTSUBTHREADS);
-    if (MuttVars[idx].flags & R_RESORT)
+    if (option->flags & R_RESORT)
       set_option (OPTNEEDRESORT);
-    if (MuttVars[idx].flags & R_RESORT_INIT)
+    if (option->flags & R_RESORT_INIT)
       set_option (OPTRESORTINIT);
-    if (MuttVars[idx].flags & R_TREE)
+    if (option->flags & R_TREE)
       set_option (OPTREDRAWTREE);
   }
   return (r);
@@ -1870,6 +1688,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
 {
   char var[STRING], *pt = buffer;
   int spaces;
+  struct option_t* option = NULL;
 
   if (buffer[0] == 0)
     return 0;
@@ -1885,12 +1704,10 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
     return 0;
 
   if (str_ncmp (buffer, "set", 3) == 0) {
-    int idx;
-
     strfcpy (var, pt, sizeof (var));
     /* ignore the trailing '=' when comparing */
     var[str_len (var) - 1] = 0;
-    if ((idx = mutt_option_index (var)) == -1)
+    if (!(option = hash_find (ConfigOptions, var)))
       return 0;                 /* no such variable. */
     else {
       char tmp[LONG_STRING], tmp2[LONG_STRING];
@@ -1900,26 +1717,26 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
 
       tmp[0] = '\0';
 
-      if ((DTYPE (MuttVars[idx].type) == DT_STR) ||
-          (DTYPE (MuttVars[idx].type) == DT_PATH) ||
-          (DTYPE (MuttVars[idx].type) == DT_RX)) {
-        strfcpy (tmp, NONULL (*((char **) MuttVars[idx].data)), sizeof (tmp));
-        if (DTYPE (MuttVars[idx].type) == DT_PATH)
+      if ((DTYPE (option->type) == DT_STR) ||
+          (DTYPE (option->type) == DT_PATH) ||
+          (DTYPE (option->type) == DT_RX)) {
+        strfcpy (tmp, NONULL (*((char **) option->data)), sizeof (tmp));
+        if (DTYPE (option->type) == DT_PATH)
           mutt_pretty_mailbox (tmp);
       }
-      else if (DTYPE (MuttVars[idx].type) == DT_ADDR) {
+      else if (DTYPE (option->type) == DT_ADDR) {
         rfc822_write_address (tmp, sizeof (tmp),
-                              *((ADDRESS **) MuttVars[idx].data), 0);
+                              *((ADDRESS **) option->data), 0);
       }
-      else if (DTYPE (MuttVars[idx].type) == DT_QUAD)
-        strfcpy (tmp, vals[quadoption (MuttVars[idx].data)], sizeof (tmp));
-      else if (DTYPE (MuttVars[idx].type) == DT_NUM)
-        snprintf (tmp, sizeof (tmp), "%d", (*((short *) MuttVars[idx].data)));
-      else if (DTYPE (MuttVars[idx].type) == DT_SORT) {
+      else if (DTYPE (option->type) == DT_QUAD)
+        strfcpy (tmp, vals[quadoption (option->data)], sizeof (tmp));
+      else if (DTYPE (option->type) == DT_NUM)
+        snprintf (tmp, sizeof (tmp), "%d", (*((short *) option->data)));
+      else if (DTYPE (option->type) == DT_SORT) {
         const struct mapping_t *map;
         char *p;
 
-        switch (MuttVars[idx].type & DT_SUBTYPE_MASK) {
+        switch (option->type & DT_SUBTYPE_MASK) {
         case DT_SORT_ALIAS:
           map = SortAliasMethods;
           break;
@@ -1937,15 +1754,15 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
           break;
         }
         p =
-          mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK,
+          mutt_getnamebyvalue (*((short *) option->data) & SORT_MASK,
                                map);
         snprintf (tmp, sizeof (tmp), "%s%s%s",
-                  (*((short *) MuttVars[idx].data) & SORT_REVERSE) ?
+                  (*((short *) option->data) & SORT_REVERSE) ?
                   "reverse-" : "",
-                  (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" :
+                  (*((short *) option->data) & SORT_LAST) ? "last-" :
                   "", p);
       } 
-      else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) {
+      else if (DTYPE (option->type) == DT_MAGIC) {
         char *p;
         switch (DefaultMagic) {
           case M_MBOX:
@@ -1965,8 +1782,8 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
         }
         strfcpy (tmp, p, sizeof (tmp));
       }
-      else if (DTYPE (MuttVars[idx].type) == DT_BOOL)
-        strfcpy (tmp, option (MuttVars[idx].data) ? "yes" : "no",
+      else if (DTYPE (option->type) == DT_BOOL)
+        strfcpy (tmp, option (option->data) ? "yes" : "no",
                  sizeof (tmp));
       else
         return 0;
@@ -2069,6 +1886,11 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   err.data = error;
   err.dsize = sizeof (error);
 
+  /* use 3*sizeof(muttvars) to have some room for $user_ vars */
+  ConfigOptions = hash_create (sizeof (MuttVars) * 3);
+  for (i = 0; MuttVars[i].option; i++)
+    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
+
   /* 
    * XXX - use something even more difficult to predict?
    */
@@ -2211,10 +2033,8 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
 
   /* Set standard defaults */
-  for (i = 0; MuttVars[i].option; i++) {
-    mutt_set_default (&MuttVars[i]);
-    mutt_restore_default (&MuttVars[i]);
-  }
+  hash_map (ConfigOptions, mutt_set_default, 0);
+  hash_map (ConfigOptions, mutt_restore_default, 0);
 
   CurrentMenu = MENU_MAIN;
 
@@ -2324,13 +2144,18 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   if (!list_empty(Synonyms)) {
     int i = 0;
     fprintf (stderr, _("Warning: the following synonym variables were found:\n"));
-    for (i = 0; i < Synonyms->length; i++)
+    for (i = 0; i < Synonyms->length; i++) {
+      struct option_t* newopt = NULL, *oldopt = NULL;
+      newopt = (struct option_t*) ((syn_t*) Synonyms->data[i])->n;
+      oldopt = (struct option_t*) ((syn_t*) Synonyms->data[i])->o;
       fprintf (stderr, "$%s ($%s should be used) (%s:%d)\n",
-               MuttVars[((syn_t*) Synonyms->data[i])->o].option,
-               MuttVars[((syn_t*) Synonyms->data[i])->n].option,
+               oldopt ? NONULL (oldopt->option) : "",
+               newopt ? NONULL (newopt->option) : "",
                NONULL(((syn_t*) Synonyms->data[i])->f),
                ((syn_t*) Synonyms->data[i])->l);
-    fprintf (stderr, _("Warning: synonym variables are scheduled for removal.\n"));
+    }
+    fprintf (stderr, _("Warning: synonym variables are scheduled"
+                       " for removal.\n"));
     list_del (&Synonyms, syn_del);
     need_pause = 1;
   }
@@ -2355,29 +2180,56 @@ int mutt_get_hook_type (const char *name)
   return 0;
 }
 
+/* compare two option_t*'s for sorting -t/-T output */
 static int opt_cmp (const void* a, const void* b) {
   return (str_cmp ((*(struct option_t**) a)->option,
                        (*(struct option_t**) b)->option));
 }
 
+/* callback for hash_map() to put all non-synonym vars into list */
+static void opt_sel_full (const char* key, void* data,
+                          unsigned long more) {
+  list2_t** l = (list2_t**) more;
+  struct option_t* option = (struct option_t*) data;
+
+  if (DTYPE (option->type) == DT_SYN)
+    return;
+  list_push_back (l, option);
+}
+
+/* callback for hash_map() to put all changed non-synonym vars into list */
+static void opt_sel_diff (const char* key, void* data,
+                          unsigned long more) {
+  list2_t** l = (list2_t**) more;
+  struct option_t* option = (struct option_t*) data;
+  char buf[LONG_STRING];
+
+  if (DTYPE (option->type) == DT_SYN)
+    return;
+
+  mutt_option_value (option->option, buf, sizeof (buf));
+  if (str_cmp (buf, option->init) != 0)
+    list_push_back (l, option);
+}
+
 /* dump out the value of all the variables we have */
-int mutt_dump_variables (void) {
-  int i = 0, idx = 0;
+int mutt_dump_variables (int full) {
+  int i = 0;
   char outbuf[STRING];
   list2_t* tmp = NULL;
+  struct option_t* option = NULL;
 
   /* get all non-synonyms into list... */
-  for (i = 0; MuttVars[i].option; i++) {
-    if (MuttVars[i].type == DT_SYN)
-      continue;
-    list_push_back (&tmp, &MuttVars[i]);
-  }
+  hash_map (ConfigOptions, full ? opt_sel_full : opt_sel_diff,
+            (unsigned long) &tmp);
+
   if (!list_empty(tmp)) {
     /* ...and dump list sorted */
     qsort (tmp->data, tmp->length, sizeof (void*), opt_cmp);
     for (i = 0; i < tmp->length; i++) {
-      idx = mutt_option_index (((struct option_t*) tmp->data[i])->option);
-      FuncTable[DTYPE (MuttVars[idx].type)].opt_to_string (outbuf, sizeof (outbuf), idx);
+      option = (struct option_t*) tmp->data[i];
+      FuncTable[DTYPE (option->type)].opt_to_string
+        (outbuf, sizeof (outbuf), option);
       printf ("%s\n", outbuf);
     }
   }
diff --git a/init.h b/init.h
index 1dcd56c..fd3d191 100644
--- a/init.h
+++ b/init.h
@@ -20,49 +20,50 @@
 #include "buffy.h"
 
 #ifndef _MAKEDOC
-#define DT_MASK		0x0f
-#define DT_BOOL		1       /* boolean option */
-#define DT_NUM		2       /* a number */
-#define DT_STR		3       /* a string */
-#define DT_PATH		4       /* a pathname */
-#define DT_QUAD		5       /* quad-option (yes/no/ask-yes/ask-no) */
-#define DT_SORT		6       /* sorting methods */
-#define DT_RX		7       /* regular expressions */
-#define DT_MAGIC	8       /* mailbox type */
-#define DT_SYN		9       /* synonym for another variable */
-#define DT_ADDR	       10       /* e-mail address */
+#define DT_MASK         0x0f
+#define DT_BOOL         1       /* boolean option */
+#define DT_NUM          2       /* a number */
+#define DT_STR          3       /* a string */
+#define DT_PATH         4       /* a pathname */
+#define DT_QUAD         5       /* quad-option (yes/no/ask-yes/ask-no) */
+#define DT_SORT         6       /* sorting methods */
+#define DT_RX           7       /* regular expressions */
+#define DT_MAGIC        8       /* mailbox type */
+#define DT_SYN          9       /* synonym for another variable */
+#define DT_ADDR         10      /* e-mail address */
+#define DT_USER         11      /* user defined viar $user_ */
 
 #define DTYPE(x) ((x) & DT_MASK)
 
 /* subtypes */
-#define DT_SUBTYPE_MASK	0xf0
-#define DT_SORT_ALIAS	0x10
+#define DT_SUBTYPE_MASK 0xf0
+#define DT_SORT_ALIAS   0x10
 #define DT_SORT_BROWSER 0x20
-#define DT_SORT_KEYS	0x40
-#define DT_SORT_AUX	0x80
+#define DT_SORT_KEYS    0x40
+#define DT_SORT_AUX     0x80
 
 /* flags to parse_set() */
-#define M_SET_INV	(1<<0)  /* default is to invert all vars */
-#define M_SET_UNSET	(1<<1)  /* default is to unset all vars */
-#define M_SET_RESET	(1<<2)  /* default is to reset all vars to default */
+#define M_SET_INV       (1<<0)  /* default is to invert all vars */
+#define M_SET_UNSET     (1<<1)  /* default is to unset all vars */
+#define M_SET_RESET     (1<<2)  /* default is to reset all vars to default */
 
 /* forced redraw/resort types */
-#define R_NONE		0
-#define R_INDEX		(1<<0)
-#define R_PAGER		(1<<1)
-#define R_RESORT	(1<<2)  /* resort the mailbox */
-#define R_RESORT_SUB	(1<<3)  /* resort subthreads */
-#define R_RESORT_INIT	(1<<4)  /* resort from scratch */
-#define R_TREE		(1<<5)  /* redraw the thread tree */
-#define R_BOTH		(R_INDEX|R_PAGER)
-#define R_RESORT_BOTH	(R_RESORT|R_RESORT_SUB)
+#define R_NONE          0
+#define R_INDEX         (1<<0)
+#define R_PAGER         (1<<1)
+#define R_RESORT        (1<<2)  /* resort the mailbox */
+#define R_RESORT_SUB    (1<<3)  /* resort subthreads */
+#define R_RESORT_INIT   (1<<4)  /* resort from scratch */
+#define R_TREE          (1<<5)  /* redraw the thread tree */
+#define R_BOTH          (R_INDEX|R_PAGER)
+#define R_RESORT_BOTH   (R_RESORT|R_RESORT_SUB)
 
 struct option_t {
   char *option;
   short type;
   short flags;
   unsigned long data;
-  unsigned long init;           /* initial value */
+  char* init;
 };
 
 struct feature_t {
@@ -124,25 +125,25 @@ struct feature_t {
 
 struct option_t MuttVars[] = {
   /*++*/
-  {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, M_NO},
+  {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" },
   /*
    ** .pp
    ** This variable specifies whether to abort sending if no attachment
    ** was made but the content references them, i.e. the content
    ** matches the regular expression given in
-   ** $$$attach_remind_regexp. If a match was found and this
+   ** $$attach_remind_regexp. If a match was found and this
    ** variable is set to \fIyes\fP, message sending will be aborted
    ** but the mail will be send nevertheless if set to \fIno\fP.
    **
    ** .pp
-   ** This variable and $$$attach_remind_regexp are intended to
+   ** This variable and $$attach_remind_regexp are intended to
    ** remind the user to attach files if the message's text
    ** references them.
    **
    ** .pp
-   ** See also the $$$attach_remind_regexp variable.
+   ** See also the $$attach_remind_regexp variable.
    */
-  {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, M_ASKYES},
+  {"abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, "ask-yes" },
   /*
    ** .pp
    ** If set to \fIyes\fP, when composing messages and no subject is given
@@ -150,7 +151,7 @@ struct option_t MuttVars[] = {
    ** \fIno\fP, composing messages with no subject given at the subject
    ** prompt will never be aborted.
    */
-  {"abort_unmodified", DT_QUAD, R_NONE, OPT_ABORT, M_YES},
+  {"abort_unmodified", DT_QUAD, R_NONE, OPT_ABORT, "yes" },
   /*
    ** .pp
    ** If set to \fIyes\fP, composition will automatically abort after
@@ -158,7 +159,7 @@ struct option_t MuttVars[] = {
    ** check only happens after the \fIfirst\fP edit of the file).  When set
    ** to \fIno\fP, composition will never be aborted.
    */
-  {"alias_file", DT_PATH, R_NONE, UL &AliasFile, UL "~/.muttngrc"},
+  {"alias_file", DT_PATH, R_NONE, UL &AliasFile, "~/.muttngrc"},
   /*
    ** .pp
    ** The default file in which to save aliases created by the 
@@ -167,7 +168,7 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP Mutt-ng will not automatically source this file; you must
    ** explicitly use the ``$source'' command for it to be executed.
    */
-  {"alias_format", DT_STR, R_NONE, UL &AliasFmt, UL "%4n %2f %t %-10a   %r"},
+  {"alias_format", DT_STR, R_NONE, UL &AliasFmt, "%4n %2f %t %-10a   %r"},
   /*
    ** .pp
    ** Specifies the format of the data displayed for the ``alias'' menu. The
@@ -181,13 +182,13 @@ struct option_t MuttVars[] = {
    ** .dt %t .dd character which indicates if the alias is tagged for inclusion
    ** .de
    */
-  {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, 1},
+  {"allow_8bit", DT_BOOL, R_NONE, OPTALLOW8BIT, "yes" },
   /*
    ** .pp
    ** Controls whether 8-bit data is converted to 7-bit using either
    ** \fTquoted-printable\fP or \fTbase64\fP encoding when sending mail.
    */
-  {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, 0},
+  {"allow_ansi", DT_BOOL, R_NONE, OPTALLOWANSI, "no" },
   /*
    ** .pp
    ** Controls whether ANSI color codes in messages (and color tags in 
@@ -198,7 +199,7 @@ struct option_t MuttVars[] = {
    ** message could include a line like ``\fT[-- PGP output follows ...\fP" and
    ** give it the same color as your attachment color.
    */
-  {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, 0},
+  {"arrow_cursor", DT_BOOL, R_BOTH, OPTARROWCURSOR, "no" },
   /*
    ** .pp
    ** When \fIset\fP, an arrow (``\fT->\fP'') will be used to indicate the current entry
@@ -207,25 +208,25 @@ struct option_t MuttVars[] = {
    ** be redrawn on the screen when moving to the next or previous entries
    ** in the menu.
    */
-  {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, 0},
+  {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will use plain ASCII characters when displaying thread
    ** and attachment trees, instead of the default \fTACS\fP characters.
    */
-  {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, 0},
+  {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will prompt you for blind-carbon-copy (Bcc) recipients
    ** before editing an outgoing message.
    */
-  {"askcc", DT_BOOL, R_NONE, OPTASKCC, 0},
+  {"askcc", DT_BOOL, R_NONE, OPTASKCC, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will prompt you for carbon-copy (Cc) recipients before
    ** editing the body of an outgoing message.
    */
-  {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, UL "us-ascii"},
+  {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, "us-ascii"},
   /*
    ** .pp
    ** This variable is a colon-separated list of character encoding
@@ -244,7 +245,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"ask_followup_to", DT_SYN, R_NONE, UL "nntp_ask_followup_to", 0},
-  {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0},
+  {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -254,7 +255,7 @@ struct option_t MuttVars[] = {
    ** field before editing the body of an outgoing news article.
    */
   {"ask_x_comment_to", DT_SYN, R_NONE, UL "nntp_ask_x_comment_to", 0},
-  {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, 0},
+  {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, "no" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -264,7 +265,7 @@ struct option_t MuttVars[] = {
    ** field before editing the body of an outgoing news article.
    */
 #endif
-  {"attach_format", DT_STR, R_NONE, UL &AttachFormat, UL "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "},
+  {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "},
   /*
    ** .pp
    ** This variable describes the format of the ``attachment'' menu.  The
@@ -289,23 +290,23 @@ struct option_t MuttVars[] = {
    ** .dt %|X .dd pad to the end of the line with character "X"
    ** .de
    */
-  {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, UL "attach"},
+  {"attach_remind_regexp", DT_RX, R_NONE, UL &AttachRemindRegexp, "attach"},
   /*
    ** .pp
    ** If this variable is non-empty, muttng will scan a message's contents
    ** before sending for this regular expression. If it is found, it will
-   ** ask for what to do depending on the setting of $$$abort_noattach.
+   ** ask for what to do depending on the setting of $$abort_noattach.
    ** .pp
-   ** This variable and $$$abort_noattach are intended to remind the user
+   ** This variable and $$abort_noattach are intended to remind the user
    ** to attach files if the message's text references them.
    */
-  {"attach_sep", DT_STR, R_NONE, UL &AttachSep, UL "\n"},
+  {"attach_sep", DT_STR, R_NONE, UL &AttachSep, "\n"},
   /*
    ** .pp
    ** The separator to add between attachments when operating (saving,
    ** printing, piping, etc) on a list of tagged attachments.
    */
-  {"attach_split", DT_BOOL, R_NONE, OPTATTACHSPLIT, 1},
+  {"attach_split", DT_BOOL, R_NONE, OPTATTACHSPLIT, "yes" },
   /*
    ** .pp
    ** If this variable is \fIunset\fP, when operating (saving, printing, piping,
@@ -314,14 +315,14 @@ struct option_t MuttVars[] = {
    ** ``$$attach_sep'' separator is added after each attachment. When \fIset\fP,
    ** Mutt-ng will operate on the attachments one by one.
    */
-  {"attribution", DT_STR, R_NONE, UL &Attribution, UL "On %d, %n wrote:"},
+  {"attribution", DT_STR, R_NONE, UL &Attribution, "On %d, %n wrote:"},
   /*
    ** .pp
    ** This is the string that will precede a message which has been included
    ** in a reply.  For a full listing of defined \fTprintf(3)\fP-like sequences see
    ** the section on ``$$index_format''.
    */
-  {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, 0},
+  {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, "no" },
   /*
    ** .pp
    ** When \fIset\fP along with ``$$edit_headers'', Mutt-ng will skip the initial
@@ -331,7 +332,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see ``$$fast_reply''.
    */
-  {"auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, 0},
+  {"auto_tag", DT_BOOL, R_NONE, OPTAUTOTAG, "no" },
   /*
    ** .pp
    ** When \fIset\fP, functions in the \fIindex\fP menu which affect a message
@@ -339,19 +340,19 @@ struct option_t MuttVars[] = {
    ** unset, you must first use the ``tag-prefix'' function (default: "\fT;\fP") to
    ** make the next function apply to all tagged messages.
    */
-  {"beep", DT_BOOL, R_NONE, OPTBEEP, 1},
+  {"beep", DT_BOOL, R_NONE, OPTBEEP, "yes" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, Mutt-ng will beep when an error occurs.
    */
-  {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, 0},
+  {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, "no" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, Mutt-ng will beep whenever it prints a message
    ** notifying you of new mail.  This is independent of the setting of the
    ** ``$$beep'' variable.
    */
-  {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, M_ASKYES},
+  {"bounce", DT_QUAD, R_NONE, OPT_BOUNCE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether you will be asked to confirm bouncing messages.
@@ -359,14 +360,14 @@ struct option_t MuttVars[] = {
    ** message. Setting this variable to \fIno\fP is not generally useful,
    ** and thus not recommended, because you are unable to bounce messages.
    */
-  {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, 1},
+  {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, "yes" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, Mutt-ng will include 
    ** \fTDelivered-To:\fP header fields when bouncing messages.
    ** Postfix users may wish to \fIunset\fP this variable.
    */
-  { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
+  { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, "no" },
   /*
    ** .pp
    ** When this variable is set, mutt will place the cursor at the beginning
@@ -377,7 +378,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"catchup_newsgroup", DT_SYN, R_NONE, UL "nntp_catchup", 0},
-  {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, M_ASKYES},
+  {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -387,12 +388,12 @@ struct option_t MuttVars[] = {
    ** as read when you leaving it.
    */
 #endif
-  {"charset", DT_STR, R_NONE, UL &Charset, UL 0},
+  {"charset", DT_STR, R_NONE, UL &Charset, "" },
   /*
    ** .pp
    ** Character set your terminal uses to display and enter textual data.
    */
-  {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, 1},
+  {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" },
   /*
    ** .pp
    ** \fBNote:\fP this option only affects \fImaildir\fP and \fIMH\fP style
@@ -404,19 +405,19 @@ struct option_t MuttVars[] = {
    ** checking each file to see if it has already been looked at.  If it's
    ** \fIunset\fP, no check for new mail is performed while the mailbox is open.
    */
-  {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, 1},
+  {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, Mutt-ng will not collapse a thread if it contains any
    ** unread messages.
    */
-  {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, 0},
+  {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will jump to the next unread message, if any,
    ** when the current thread is \fIun\fPcollapsed.
    */
-  {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, UL "-- Mutt-ng: Compose  [Approx. msg size: %l   Atts: %a]%>-"},
+  {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, "-- Mutt-ng: Compose  [Approx. msg size: %l   Atts: %a]%>-"},
   /*
    ** .pp
    ** Controls the format of the status line displayed in the ``compose''
@@ -433,38 +434,38 @@ struct option_t MuttVars[] = {
    ** See the text describing the ``$$status_format'' option for more 
    ** information on how to set ``$$compose_format''.
    */
-  {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, UL 0},
+  {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, "" },
   /*
    ** .pp
    ** When defined, Mutt-ng will recode commands in rc files from this
    ** encoding.
    */
-  {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, 1},
+  {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will prompt for confirmation when appending messages to
    ** an existing mailbox.
    */
-  {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, 1},
+  {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will prompt for confirmation when saving messages to a
    ** mailbox which does not yet exist before creating it.
    */
-  {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, 30},
+  {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, "30" },
   /*
    ** .pp
    ** Causes Mutt-ng to timeout a network connection (for IMAP or POP) after this
    ** many seconds if the connection is not able to be established.  A negative
    ** value causes Mutt-ng to wait indefinitely for the connection to succeed.
    */
-  {"content_type", DT_STR, R_NONE, UL &ContentType, UL "text/plain"},
+  {"content_type", DT_STR, R_NONE, UL &ContentType, "text/plain"},
   /*
    ** .pp
    ** Sets the default \fTContent-Type:\fP header field for the body
    ** of newly composed messages.
    */
-  {"copy", DT_QUAD, R_NONE, OPT_COPY, M_YES},
+  {"copy", DT_QUAD, R_NONE, OPT_COPY, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not copies of your outgoing messages
@@ -472,7 +473,7 @@ struct option_t MuttVars[] = {
    ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''.
    */
 
-  {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, 0},
+  {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" },
   /*
    ** .pp
    ** This variable controls the use the GPGME enabled crypto backends.
@@ -483,7 +484,7 @@ struct option_t MuttVars[] = {
    ** file as it won't have any effect when used interactively.
    */
 
-  {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, 1},
+  {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not Mutt-ng may automatically enable
@@ -491,7 +492,7 @@ struct option_t MuttVars[] = {
    ** ``$$crypt_replyencrypt'',
    ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''.
    */
-  {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, 1},
+  {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not Mutt-ng may automatically enable
@@ -499,7 +500,7 @@ struct option_t MuttVars[] = {
    ** ``$$crypt_replyencrypt'',
    ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''.
    */
-  {"date_format", DT_STR, R_BOTH, UL &DateFmt, UL "!%a, %b %d, %Y at %I:%M:%S%p %Z"},
+  {"date_format", DT_STR, R_BOTH, UL &DateFmt, "!%a, %b %d, %Y at %I:%M:%S%p %Z"},
   /*
    ** .pp
    ** This variable controls the format of the date printed by the ``\fT%d\fP''
@@ -513,7 +514,7 @@ struct option_t MuttVars[] = {
    ** rest of the string are expanded in the \fIC\fP locale (that is in US
    ** English).
    */
-  {"default_hook", DT_STR, R_NONE, UL &DefaultHook, UL "~f %s !~P | (~P ~C %s)"},
+  {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"},
   /*
    ** .pp
    ** This variable controls how send-hooks, message-hooks, save-hooks,
@@ -527,7 +528,7 @@ struct option_t MuttVars[] = {
    ** ``alternates'') and is to or cc'ed to a user matching the given
    ** regular expression.
    */
-  {"delete", DT_QUAD, R_NONE, OPT_DELETE, M_ASKYES},
+  {"delete", DT_QUAD, R_NONE, OPT_DELETE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not messages are really deleted when closing or
@@ -535,33 +536,33 @@ struct option_t MuttVars[] = {
    ** deleting will automatically be purged without prompting.  If set to
    ** \fIno\fP, messages marked for deletion will be kept in the mailbox.
    */
-  {"delete_space", DT_BOOL, R_NONE, OPTDELSP, 0},
+  {"delete_space", DT_BOOL, R_NONE, OPTDELSP, "no" },
   /*
    ** .pp
    ** When sending messages with \fTformat=flowed\fP by \fIsetting\fP the
-   ** $$$text_flowed variable, this variable specifies whether to also
+   ** $$text_flowed variable, this variable specifies whether to also
    ** set the \fTDelSp\fP parameter to \fTyes\fP. If this is \fIunset\fP,
    ** no additional parameter will be send as a value of \fTno\fP already
    ** is the default behavior.
    **
    ** .pp
    ** \fBNote:\fP this variable only has an effect on \fIoutgoing\fP messages
-   ** (if $$$text_flowed is \fIset\fP) but not on incomming.
+   ** (if $$text_flowed is \fIset\fP) but not on incomming.
    */
-  {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, 1},
+  {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, "yes" },
   /*
    ** .pp
    ** If this option is \fIset\fP, Mutt-ng will untag messages when marking them
    ** for deletion.  This applies when you either explicitly delete a message,
    ** or when you save it to another folder.
    */
-  {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, 1},
+  {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, "yes" },
   /*
    ** .pp
    ** If this option is \fIset\fP, Mutt-ng's received-attachments menu will not show the subparts of
    ** individual messages in a multipart/digest.  To see these subparts, press 'v' on that menu.
    */
-  {"display_filter", DT_PATH, R_PAGER, UL &DisplayFilter, UL ""},
+  {"display_filter", DT_PATH, R_PAGER, UL &DisplayFilter, ""},
   /*
    ** .pp
    ** When \fIset\fP, specifies a command used to filter messages.  When a message
@@ -569,7 +570,7 @@ struct option_t MuttVars[] = {
    ** filtered message is read from the standard output.
    */
 #if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
-  {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, UL BINDIR "/muttng_dotlock"},
+  {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, BINDIR "/muttng_dotlock"},
   /*
    ** .pp
    ** Availability: Standalone and Dotlock
@@ -579,7 +580,7 @@ struct option_t MuttVars[] = {
    ** Mutt-ng.
    */
 #endif
-  {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, UL ""},
+  {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
   /*
    ** .pp
    ** \fBNote:\fP you should not enable this unless you are using Sendmail
@@ -594,7 +595,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Example: \fTset dsn_notify="failure,delay"\fP
    */
-  {"dsn_return", DT_STR, R_NONE, UL &DsnReturn, UL ""},
+  {"dsn_return", DT_STR, R_NONE, UL &DsnReturn, ""},
   /*
    ** .pp
    ** \fBNote:\fP you should not enable this unless you are using Sendmail
@@ -606,7 +607,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Example: \fTset dsn_return=hdrs\fP
    */
-  {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, 1},
+  {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" },
   /*
    ** .pp
    ** This variable controls whether Mutt-ng, when sorting by threads, threads
@@ -614,20 +615,20 @@ struct option_t MuttVars[] = {
    ** If it is \fIset\fP, it will indicate that it thinks they are duplicates
    ** of each other with an equals sign in the thread diagram.
    */
-  {"edit_headers", DT_BOOL, R_NONE, OPTEDITHDRS, 0},
+  {"edit_headers", DT_BOOL, R_NONE, OPTEDITHDRS, "no" },
   /*
    ** .pp
    ** This option allows you to edit the header of your outgoing messages
    ** along with the body of your message.
    */
-  {"editor", DT_PATH, R_NONE, UL &Editor, 0},
+  {"editor", DT_PATH, R_NONE, UL &Editor, "" },
   /*
    ** .pp
    ** This variable specifies which editor is used by Mutt-ng.
    ** It defaults to the value of the \fT$$$VISUAL\fP, or \fT$$$EDITOR\fP, environment
    ** variable, or to the string "\fTvi\fP" if neither of those are set.
    */
-  {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, 0},
+  {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will \fTquoted-printable\fP encode messages when
@@ -642,7 +643,7 @@ struct option_t MuttVars[] = {
    ** you must take care of space-stuffing <tt/From / lines (with a trailing
    ** space) yourself.
    */
-  {"envelope_from", DT_BOOL, R_NONE, OPTENVFROM, 0},
+  {"envelope_from", DT_BOOL, R_NONE, OPTENVFROM, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will try to derive the message's \fIenvelope\fP
@@ -652,12 +653,12 @@ struct option_t MuttVars[] = {
    ** or if the sendmail on your machine doesn't support that command
    ** line switch.
    */
-  {"escape", DT_STR, R_NONE, UL &EscChar, UL "~"},
+  {"escape", DT_STR, R_NONE, UL &EscChar, "~"},
   /*
    ** .pp
    ** Escape character to use for functions in the builtin editor.
    */
-  {"fast_reply", DT_BOOL, R_NONE, OPTFASTREPLY, 0},
+  {"fast_reply", DT_BOOL, R_NONE, OPTFASTREPLY, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the initial prompt for recipients and subject are skipped
@@ -667,13 +668,13 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP this variable has no effect when the ``$$autoedit''
    ** variable is \fIset\fP.
    */
-  {"fcc_attach", DT_BOOL, R_NONE, OPTFCCATTACH, 1},
+  {"fcc_attach", DT_BOOL, R_NONE, OPTFCCATTACH, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not attachments on outgoing messages
    ** are saved along with the main body of your message.
    */
-  {"fcc_clear", DT_BOOL, R_NONE, OPTFCCCLEAR, 0},
+  {"fcc_clear", DT_BOOL, R_NONE, OPTFCCCLEAR, "no" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, FCCs will be stored unencrypted and
@@ -681,7 +682,7 @@ struct option_t MuttVars[] = {
    ** signed.
    ** (PGP only)
    */
-  {"file_charset", DT_STR, R_NONE, UL &FileCharset, UL 0},
+  {"file_charset", DT_STR, R_NONE, UL &FileCharset, "" },
   /*
    ** .pp
    ** This variable is a colon-separated list of character encoding
@@ -695,7 +696,7 @@ struct option_t MuttVars[] = {
    ** Note: ``\fTiso-2022-*\fP'' must be put at the head of the value as shown above
    ** if included.
    */
-  {"folder", DT_PATH, R_NONE, UL &Maildir, UL "~/Mail"},
+  {"folder", DT_PATH, R_NONE, UL &Maildir, "~/Mail"},
   /*
    ** .pp
    ** Specifies the default location of your mailboxes.  A ``\fT+\fP'' or ``\fT=\fP'' at the
@@ -705,7 +706,7 @@ struct option_t MuttVars[] = {
    ** you use ``+'' or ``='' for any other variables since expansion takes place
    ** during the ``set'' command.
    */
-  {"folder_format", DT_STR, R_INDEX, UL &FolderFormat, UL "%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f"},
+  {"folder_format", DT_STR, R_INDEX, UL &FolderFormat, "%2C %t %N %F %2l %-8.8u %-8.8g %8s %d %f"},
   /*
    ** .pp
    ** This variable allows you to customize the file browser display to your
@@ -727,7 +728,7 @@ struct option_t MuttVars[] = {
    ** .dt %|X .dd pad to the end of the line with character "X"
    ** .de
    */
-  {"followup_to", DT_BOOL, R_NONE, OPTFOLLOWUPTO, 1},
+  {"followup_to", DT_BOOL, R_NONE, OPTFOLLOWUPTO, "yes" },
   /*
    ** .pp
    ** Controls whether or not the \fTMail-Followup-To:\fP header field is
@@ -749,7 +750,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"followup_to_poster", DT_SYN, R_NONE, UL "nntp_followup_to_poster", 0},
-  {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, M_ASKYES},
+  {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -761,7 +762,7 @@ struct option_t MuttVars[] = {
    ** message via mail.
    */
 #endif
-  {"force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0},
+  {"force_name", DT_BOOL, R_NONE, OPTFORCENAME, "no" },
   /*
    ** .pp
    ** This variable is similar to ``$$save_name'', except that Mutt-ng will
@@ -770,7 +771,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the ``$$record'' variable.
    */
-  {"force_buffy_check", DT_BOOL, R_NONE, OPTFORCEBUFFYCHECK, 0},
+  {"force_buffy_check", DT_BOOL, R_NONE, OPTFORCEBUFFYCHECK, "no" },
   /*
    ** .pp
    ** When \fIset\fP, it causes Mutt-ng to check for new mail when the
@@ -780,7 +781,7 @@ struct option_t MuttVars[] = {
    ** Also see the following variables: ``$$timeout'', ``$$mail_check'' and
    ** ``$$imap_mail_check''.
    */
-  {"forward_decode", DT_BOOL, R_NONE, OPTFORWDECODE, 1},
+  {"forward_decode", DT_BOOL, R_NONE, OPTFORWDECODE, "yes" },
   /*
    ** .pp
    ** Controls the decoding of complex MIME messages into \fTtext/plain\fP when
@@ -788,27 +789,27 @@ struct option_t MuttVars[] = {
    ** This variable is only used, if ``$$mime_forward'' is \fIunset\fP,
    ** otherwise ``$$mime_forward_decode'' is used instead.
    */
-  {"forward_edit", DT_QUAD, R_NONE, OPT_FORWEDIT, M_YES},
+  {"forward_edit", DT_QUAD, R_NONE, OPT_FORWEDIT, "yes" },
   /*
    ** .pp
    ** This quadoption controls whether or not the user is automatically
    ** placed in the editor when forwarding messages.  For those who always want
    ** to forward with no modification, use a setting of \fIno\fP.
    */
-  {"forward_format", DT_STR, R_NONE, UL &ForwFmt, UL "[%a: %s]"},
+  {"forward_format", DT_STR, R_NONE, UL &ForwFmt, "[%a: %s]"},
   /*
    ** .pp
    ** This variable controls the default subject when forwarding a message.
    ** It uses the same format sequences as the ``$$index_format'' variable.
    */
-  {"forward_quote", DT_BOOL, R_NONE, OPTFORWQUOTE, 0},
+  {"forward_quote", DT_BOOL, R_NONE, OPTFORWQUOTE, "no" },
   /*
    ** .pp
    ** When \fIset\fP forwarded messages included in the main body of the
    ** message (when ``$$mime_forward'' is \fIunset\fP) will be quoted using
    ** ``$$indent_string''.
    */
-  {"from", DT_ADDR, R_NONE, UL &From, UL 0},
+  {"from", DT_ADDR, R_NONE, UL &From, "" },
   /*
    ** .pp
    ** This variable contains a default from address.  It
@@ -822,7 +823,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP.
    */
-  {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, UL "^[^,]*"},
+  {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, "^[^,]*"},
   /*
    ** .pp
    ** A regular expression used by Mutt-ng to parse the GECOS field of a password
@@ -839,7 +840,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"group_index_format", DT_SYN, R_NONE, UL "nntp_group_index_format", 0},
-  {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, UL "%4C %M%N %5s  %-45.45f %d"},
+  {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s  %-45.45f %d"},
   /*
    ** .pp
    ** Availability: NNTP
@@ -862,7 +863,7 @@ struct option_t MuttVars[] = {
    ** .te
    */
 #endif
-  {"hdrs", DT_BOOL, R_NONE, OPTHDRS, 1},
+  {"hdrs", DT_BOOL, R_NONE, OPTHDRS, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, the header fields normally added by the ``$my_hdr''
@@ -870,14 +871,14 @@ struct option_t MuttVars[] = {
    ** composing a new message or replying in order to take effect.  If \fIset\fP,
    ** the user defined header fields are added to every new message.
    */
-  {"header", DT_BOOL, R_NONE, OPTHEADER, 0},
+  {"header", DT_BOOL, R_NONE, OPTHEADER, "no" },
   /*
    ** .pp
    ** When \fIset\fP, this variable causes Mutt-ng to include the header
    ** of the message you are replying to into the edit buffer.
    ** The ``$$weed'' setting applies.
    */
-  {"help", DT_BOOL, R_BOTH, OPTHELP, 1},
+  {"help", DT_BOOL, R_BOTH, OPTHELP, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, help lines describing the bindings for the major functions
@@ -889,7 +890,7 @@ struct option_t MuttVars[] = {
    ** running.  Since this variable is primarily aimed at new users, neither
    ** of these should present a major problem.
    */
-  {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, 0},
+  {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will skip the host name part of ``$$hostname'' variable
@@ -897,53 +898,53 @@ struct option_t MuttVars[] = {
    ** affect the generation of \fTMessage-ID:\fP header fields, and it will not lead to the 
    ** cut-off of first-level domains.
    */
-  {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, 0},
+  {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden
    ** by limiting, in the thread tree.
    */
-  {"hide_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDEMISSING, 1},
+  {"hide_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDEMISSING, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will not show the presence of missing messages in the
    ** thread tree.
    */
-  {"hide_thread_subject", DT_BOOL, R_TREE|R_INDEX, OPTHIDETHREADSUBJECT, 1},
+  {"hide_thread_subject", DT_BOOL, R_TREE|R_INDEX, OPTHIDETHREADSUBJECT, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will not show the subject of messages in the thread
    ** tree that have the same subject as their parent or closest previously
    ** displayed sibling.
    */
-  {"hide_top_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPLIMITED, 0},
+  {"hide_top_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPLIMITED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden
    ** by limiting, at the top of threads in the thread tree.  Note that when
    ** $$hide_missing is set, this option will have no effect.
    */
-  {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, 1},
+  {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will not show the presence of missing messages at the
    ** top of threads in the thread tree.  Note that when $$hide_limited is
    ** \fIset\fP, this option will have no effect.
    */
-  {"history", DT_NUM, R_NONE, UL &HistSize, 10},
+  {"history", DT_NUM, R_NONE, UL &HistSize, "10" },
   /*
    ** .pp
    ** This variable controls the size (in number of strings remembered) of
    ** the string history buffer. The buffer is cleared each time the
    ** variable is changed.
    */
-  {"honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, M_YES},
+  {"honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, "yes" },
   /*
    ** .pp
    ** This variable controls whether or not a \fTMail-Followup-To:\fP header field is
    ** honored when group-replying to a message.
    */
-  {"hostname", DT_STR, R_NONE, UL &Fqdn, 0},
+  {"hostname", DT_STR, R_NONE, UL &Fqdn, "" },
   /*
    ** .pp
    ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail
@@ -952,7 +953,7 @@ struct option_t MuttVars[] = {
    ** Please be sure to really know what you are doing when changing this variable
    ** to configure a custom domain part of Message-IDs.
    */
-  {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, 0},
+  {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, "no" },
   /*
    ** .pp
    ** Affects the behaviour of the \fIreply\fP function when replying to
@@ -965,7 +966,7 @@ struct option_t MuttVars[] = {
    ** list.
    */
 #ifdef USE_IMAP
-  {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, UL 0},
+  {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -987,7 +988,7 @@ struct option_t MuttVars[] = {
    ** the previous methods are unavailable. If a method is available but
    ** authentication fails, Mutt-ng will not connect to the IMAP server.
    */
-  { "imap_check_subscribed",  DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, 0 },
+  { "imap_check_subscribed",  DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, mutt will fetch the set of subscribed folders from
@@ -995,7 +996,7 @@ struct option_t MuttVars[] = {
    ** it polls for new mail. See also the ``$mailboxes'' command.
    */
   
-  {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, UL "/."},
+  {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."},
   /*
    ** .pp
    ** Availability: IMAP
@@ -1005,7 +1006,7 @@ struct option_t MuttVars[] = {
    ** as folder separators for displaying IMAP paths. In particular it
    ** helps in using the '\fT=\fP' shortcut for your $$folder variable.
    */
-  {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, UL 0},
+  {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1019,7 +1020,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBNote:\fP This is a space separated list.
    */
-  {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, UL 0},
+  {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1029,7 +1030,7 @@ struct option_t MuttVars[] = {
    ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set
    ** this variable to the IMAP path to your folders.
    */
-  {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, 900},
+  {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1047,7 +1048,7 @@ struct option_t MuttVars[] = {
    ** Reduce this number if you find yourself
    ** getting disconnected from your IMAP server due to inactivity.
    */
-  {"imap_login", DT_STR, R_NONE, UL &ImapLogin, 0 },
+  {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1057,7 +1058,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable defaults to the value of ``$$imap_user.''
    */
-  {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, 0},
+  {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1067,14 +1068,14 @@ struct option_t MuttVars[] = {
    ** only subscribed folders or all folders.  This can be toggled in the
    ** IMAP browser with the \fItoggle-subscribed\fP function.
    */
-  {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, 300},
+  {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, "300" },
   /*
    ** .pp
    ** This variable configures how often (in seconds) Mutt-ng should look for
    ** new mail in IMAP folders. This is split from the ``$mail_check'' variable
    ** to generate less traffic and get more accurate information for local folders.
    */
-  {"imap_pass", DT_STR, R_NONE, UL &ImapPass, UL 0},
+  {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1087,7 +1088,7 @@ struct option_t MuttVars[] = {
    ** fairly secure machine, because the superuser can read your configuration even
    ** if you are the only one who can read the file.
    */
-  {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, 1},
+  {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1099,7 +1100,7 @@ struct option_t MuttVars[] = {
    ** user/password pairs on Mutt-ng invocation, or if opening the connection
    ** is slow.
    */
-  {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, 1},
+  {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1110,7 +1111,7 @@ struct option_t MuttVars[] = {
    ** but can make closing an IMAP folder somewhat slower. This option
    ** exists to appease speed freaks.
    */
-  {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, M_ASKYES},
+  {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1119,7 +1120,7 @@ struct option_t MuttVars[] = {
    ** Controls whether or not Mutt-ng will try to reconnect to IMAP server when
    ** the connection is lost.
    */
-  {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, 1},
+  {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1131,7 +1132,7 @@ struct option_t MuttVars[] = {
    ** server which are out of the users' hands, you may wish to suppress
    ** them at some point.
    */
-  {"imap_user", DT_STR, R_NONE, UL &ImapUser, UL 0},
+  {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" },
   /*
    ** .pp
    ** Availability: IMAP
@@ -1143,7 +1144,7 @@ struct option_t MuttVars[] = {
    ** This variable defaults to your user name on the local machine.
    */
 #endif
-  {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, 0},
+  {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will look for a mailcap entry with the
@@ -1152,26 +1153,26 @@ struct option_t MuttVars[] = {
    ** use the viewer defined in that entry to convert the body part to text
    ** form.
    */
-  {"include", DT_QUAD, R_NONE, OPT_INCLUDE, M_ASKYES},
+  {"include", DT_QUAD, R_NONE, OPT_INCLUDE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not a copy of the message(s) you are replying to
    ** is included in your reply.
    */
-  {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, 0},
+  {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, "no" },
   /*
    ** .pp
    ** Controls whether or not Mutt-ng includes only the first attachment
    ** of the message you are replying.
    */
-  {"indent_string", DT_STR, R_NONE, UL &Prefix, UL "> "},
+  {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "},
   /*
    ** .pp
    ** Specifies the string to prepend to each line of text quoted in a
    ** message to which you are replying.  You are strongly encouraged not to
    ** change this value, as it tends to agitate the more fanatical netizens.
    */
-  {"index_format", DT_STR, R_BOTH, UL &HdrFmt, UL "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"},
+  {"index_format", DT_STR, R_BOTH, UL &HdrFmt, "%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"},
   /*
    ** .pp
    ** This variable allows you to customize the message index display to
@@ -1241,7 +1242,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"inews", DT_SYN, R_NONE, UL "nntp_inews", 0},
-  {"nntp_inews", DT_PATH, R_NONE, UL &Inews, UL ""},
+  {"nntp_inews", DT_PATH, R_NONE, UL &Inews, ""},
   /*
    ** .pp
    ** Availability: NNTP
@@ -1258,32 +1259,32 @@ struct option_t MuttVars[] = {
    ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP
    */
 #endif
-  {"ispell", DT_PATH, R_NONE, UL &Ispell, UL ISPELL},
+  {"ispell", DT_PATH, R_NONE, UL &Ispell, ISPELL},
   /*
    ** .pp
    ** How to invoke ispell (GNU's spell-checking software).
    */
-  {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, 0},
+  {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" },
   /*
    ** .pp
    ** If \fIset\fP, 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.
    */
-  {"locale", DT_STR, R_BOTH, UL &Locale, UL "C"},
+  {"locale", DT_STR, R_BOTH, UL &Locale, "C"},
   /*
    ** .pp
    ** The locale used by \fTstrftime(3)\fP to format dates. Legal values are
    ** the strings your system accepts for the locale variable \fTLC_TIME\fP.
    */
-  {"list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO},
+  {"list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "no" },
   /*
    ** .pp
    ** When \fIset\fP, address replies to the mailing list the original message came
    ** from (instead to the author only). Setting this option to ``\fIask-yes\fP'' or
    ** ``\fIask-no\fP'' will ask if you really intended to reply to the author only.
    */
-  {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, 0},
+  {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, "0" },
   /*
    ** .pp
    ** When set non-zero, this specifies the maximum number of recipient header
@@ -1291,14 +1292,14 @@ struct option_t MuttVars[] = {
    ** weeding is turned on. In case the number of lines exeeds its value, the
    ** last line will have 3 dots appended.
    */
-  {"max_line_length", DT_NUM, R_PAGER, UL &MaxLineLength, 0},
+  {"max_line_length", DT_NUM, R_PAGER, UL &MaxLineLength, "0" },
   /*
    ** .pp
    ** When \fIset\fP, the maximum line length for displaying ``format = flowed'' messages is limited
    ** to this length. A value of 0 (which is also the default) means that the
    ** maximum line length is determined by the terminal width and $$wrapmargin.
    */
-  {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5},
+  {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, "5" },
   /*
    ** .pp
    ** This variable configures how often (in seconds) Mutt-ng should look for
@@ -1306,13 +1307,13 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBNote:\fP This does not apply to IMAP mailboxes, see $$imap_mail_check.
    */
-  {"mailcap_path", DT_STR, R_NONE, UL &MailcapPath, 0},
+  {"mailcap_path", DT_STR, R_NONE, UL &MailcapPath, "" },
   /*
    ** .pp
    ** This variable specifies which files to consult when attempting to
    ** display MIME bodies not directly supported by Mutt-ng.
    */
-  {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, 1},
+  {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will restrict possible characters in mailcap \fT%\fP expandos
@@ -1324,7 +1325,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_HCACHE
 
-  {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0},
+  {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" },
   /*
    ** .pp
    ** Availability: Header Cache
@@ -1337,7 +1338,7 @@ struct option_t MuttVars[] = {
    ** be a single global header cache. By default it is \fIunset\fP so no
    ** header caching will be used.
    */
-  {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1},
+  {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, "yes" },
   /*
    ** .pp
    ** Availability: Header Cache
@@ -1348,7 +1349,7 @@ struct option_t MuttVars[] = {
    ** message every time the folder is opened.
    */
 #if HAVE_GDBM || HAVE_DB4
-  {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384"},
+  {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, "16384"},
   /*
    ** .pp
    ** Availability: Header Cache
@@ -1364,7 +1365,7 @@ struct option_t MuttVars[] = {
    */
 #endif /* HAVE_GDBM || HAVE_DB 4 */
 #if HAVE_QDBM
-  { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 },
+  { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" },
   /*
   ** .pp
   ** If enabled the header cache will be compressed. So only one fifth of the usual
@@ -1373,7 +1374,7 @@ struct option_t MuttVars[] = {
   */
 #endif /* HAVE_QDBM */
 #endif /* USE_HCACHE */
-  {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0},
+  {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, "no" },
   /*
    ** .pp
    ** If \fIset\fP, messages marked as deleted will be saved with the maildir
@@ -1385,7 +1386,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** It is similiar to the trash option.
    */
-  {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, 1},
+  {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, "yes" },
   /*
    ** .pp
    ** Controls whether or not Mutt-ng marks \fInew\fP \fBunread\fP
@@ -1395,27 +1396,27 @@ struct option_t MuttVars[] = {
    ** will show up with an "O" next to them in the ``index'' menu,
    ** indicating that they are old.
    */
-  {"markers", DT_BOOL, R_PAGER, OPTMARKERS, 1},
+  {"markers", DT_BOOL, R_PAGER, OPTMARKERS, "yes" },
   /*
    ** .pp
    ** Controls the display of wrapped lines in the internal pager. If set, a
    ** ``\fT+\fP'' marker is displayed at the beginning of wrapped lines. Also see
    ** the ``$$smart_wrap'' variable.
    */
-  {"mask", DT_RX, R_NONE, UL &Mask, UL "!^\\.[^.]"},
+  {"mask", DT_RX, R_NONE, UL &Mask, "!^\\.[^.]"},
   /*
    ** .pp
    ** A regular expression used in the file browser, optionally preceded by
    ** the \fInot\fP operator ``\fT!\fP''.  Only files whose names match this mask
    ** will be shown. The match is always case-sensitive.
    */
-  {"mbox", DT_PATH, R_BOTH, UL &Inbox, UL "~/mbox"},
+  {"mbox", DT_PATH, R_BOTH, UL &Inbox, "~/mbox"},
   /*
    ** .pp
    ** This specifies the folder into which read mail in your ``$$spoolfile''
    ** folder will be appended.
    */
-  {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, 0},
+  {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" },
   /*
    ** .pp
    ** This specifies the operating system name for the \fTUser-Agent:\fP header field. If
@@ -1424,36 +1425,36 @@ struct option_t MuttVars[] = {
    ** .pp
    ** It may, for example, look as: ``\fTmutt-ng 1.5.9i (Linux)\fP''.
    */
-  {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, UL "." },
+  {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." },
   /*
    ** .pp
    ** When the sidebar is displayed and $$sidebar_shorten_hierarchy is \fIset\fP, this
    ** variable specifies the characters at which to split a folder name into
    ** ``hierarchy items.''
    */
-  {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, UL "|"},
+  {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"},
   /*
    ** .pp
    ** This specifies the delimiter between the sidebar (if visible) and 
    ** other screens.
    */
-  {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, 0},
+  {"sidebar_visible", DT_BOOL, R_BOTH, OPTMBOXPANE, "no" },
   /*
    ** .pp
    ** This specifies whether or not to show the sidebar (a list of folders specified
    ** with the ``mailboxes'' command).
    */
-  {"sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0},
+  {"sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, "0" },
   /*
    ** .pp
    ** The width of the sidebar.
    */
-  {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, 0},
+  {"sidebar_newmail_only", DT_BOOL, R_BOTH, OPTSIDEBARNEWMAILONLY, "no" },
   /*
    ** .pp
    ** If \fIset\fP, only folders with new mail will be shown in the sidebar.
    */
-  {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, UL "%m%?n?(%n)?%?f?[%f]?"},
+  {"sidebar_number_format", DT_STR, R_BOTH, UL &SidebarNumberFormat, "%m%?n?(%n)?%?f?[%f]?"},
   /*
    ** .pp
    ** This variable controls how message counts are printed when the sidebar
@@ -1476,7 +1477,7 @@ struct option_t MuttVars[] = {
    ** 1) These expandos only have a non-zero value for the current mailbox and
    ** will always be zero otherwise.
    */
-  {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, 0},
+  {"sidebar_shorten_hierarchy", DT_BOOL, R_NONE, OPTSHORTENHIERARCHY, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the ``hierarchy'' of the sidebar entries will be shortened
@@ -1489,32 +1490,32 @@ struct option_t MuttVars[] = {
    ** At which characters this compression is done is controled via the
    ** $$sidebar_boundary variable.
    */
-  {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, M_MBOX},
+  {"mbox_type", DT_MAGIC, R_NONE, UL &DefaultMagic, "mbox" },
   /*
    ** .pp
    ** The default mailbox type used when creating new folders. May be any of
    ** \fTmbox\fP, \fTMMDF\fP, \fTMH\fP and \fTMaildir\fP.
    */
-  {"metoo", DT_BOOL, R_NONE, OPTMETOO, 0},
+  {"metoo", DT_BOOL, R_NONE, OPTMETOO, "no" },
   /*
    ** .pp
    ** If \fIunset\fP, Mutt-ng will remove your address (see the ``alternates''
    ** command) from the list of recipients when replying to a message.
    */
-  {"menu_context", DT_NUM, R_NONE, UL &MenuContext, 0},
+  {"menu_context", DT_NUM, R_NONE, UL &MenuContext, "0" },
   /*
    ** .pp
    ** This variable controls the number of lines of context that are given
    ** when scrolling through menus. (Similar to ``$$pager_context''.)
    */
-  {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, 1},
+  {"menu_move_off", DT_BOOL, R_NONE, OPTMENUMOVEOFF, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, the bottom entry of menus will never scroll up past
    ** the bottom of the screen, unless there are less entries than lines.
    ** When \fIset\fP, the bottom entry may move off the bottom.
    */
-  {"menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, 0},
+  {"menu_scroll", DT_BOOL, R_NONE, OPTMENUSCROLL, "no" },
   /*
    ** .pp
    ** When \fIset\fP, menus will be scrolled up or down one line when you
@@ -1522,7 +1523,7 @@ struct option_t MuttVars[] = {
    ** is cleared and the next or previous page of the menu is displayed
    ** (useful for slow links to avoid many redraws).
    */
-  {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, 0},
+  {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, "no" },
   /*
    ** .pp
    ** If \fIset\fP, forces Mutt-ng to interpret keystrokes with the high bit (bit 8)
@@ -1533,7 +1534,7 @@ struct option_t MuttVars[] = {
    ** high bit from ``\fT0xf4\fP'' is ``\fT0x74\fP'', which is the ASCII character
    ** ``\fTx\fP''.
    */
-  {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, 0},
+  {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" },
   /*
    ** .pp
    ** When \fIunset\fP, Mutt-ng will mimic mh's behaviour and rename deleted messages
@@ -1541,22 +1542,22 @@ struct option_t MuttVars[] = {
    ** them.  If the variable is set, the message files will simply be
    ** deleted.
    */
-  {"mh_seq_flagged", DT_STR, R_NONE, UL &MhFlagged, UL "flagged"},
+  {"mh_seq_flagged", DT_STR, R_NONE, UL &MhFlagged, "flagged"},
   /*
    ** .pp
    ** The name of the MH sequence used for flagged messages.
    */
-  {"mh_seq_replied", DT_STR, R_NONE, UL &MhReplied, UL "replied"},
+  {"mh_seq_replied", DT_STR, R_NONE, UL &MhReplied, "replied"},
   /*
    ** .pp
    ** The name of the MH sequence used to tag replied messages.
    */
-  {"mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, UL "unseen"},
+  {"mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, "unseen"},
   /*
    ** .pp
    ** The name of the MH sequence used for unseen messages.
    */
-  {"mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, M_NO},
+  {"mime_forward", DT_QUAD, R_NONE, OPT_MIMEFWD, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the message you are forwarding will be attached as a
@@ -1570,14 +1571,14 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see ``$$forward_decode'' and ``$$mime_forward_decode''.
    */
-  {"mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, 0},
+  {"mime_forward_decode", DT_BOOL, R_NONE, OPTMIMEFORWDECODE, "no" },
   /*
    ** .pp
    ** Controls the decoding of complex MIME messages into \fTtext/plain\fP when
    ** forwarding a message while ``$$mime_forward'' is \fIset\fP. Otherwise
    ** ``$$forward_decode'' is used instead.
    */
-  {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, M_YES},
+  {"mime_forward_rest", DT_QUAD, R_NONE, OPT_MIMEFWDREST, "yes" },
   /*
    ** .pp
    ** When forwarding multiple attachments of a MIME message from the recvattach
@@ -1587,7 +1588,7 @@ struct option_t MuttVars[] = {
 
 #ifdef USE_NNTP
   {"mime_subject", DT_SYN, R_NONE, UL "nntp_mime_subject", 0},
-  {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, 1},
+  {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1601,7 +1602,7 @@ struct option_t MuttVars[] = {
 #endif
 
 #ifdef MIXMASTER
-  {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, UL "%4n %c %-16s %a"},
+  {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
   /*
    ** .pp
    ** Availability: Mixmaster
@@ -1618,7 +1619,7 @@ struct option_t MuttVars[] = {
    ** .dt %a .dd The remailer's e-mail address.
    ** .de
    */
-  {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, UL MIXMASTER},
+  {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER},
   /*
    ** .pp
    ** Availability: Mixmaster
@@ -1630,21 +1631,21 @@ struct option_t MuttVars[] = {
    ** mixmaster chain.
    */
 #endif
-  {"move", DT_QUAD, R_NONE, OPT_MOVE, M_ASKNO},
+  {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
   /*
    ** .pp
    ** Controls whether or not Mutt-ng will move read messages
    ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of
    ** a ``$mbox-hook'' command.
    */
-  {"message_format", DT_STR, R_NONE, UL &MsgFmt, UL "%s"},
+  {"message_format", DT_STR, R_NONE, UL &MsgFmt, "%s"},
   /*
    ** .pp
    ** This is the string displayed in the ``attachment'' menu for
    ** attachments of type \fTmessage/rfc822\fP.  For a full listing of defined
    ** \fTprintf(3)\fP-like sequences see the section on ``$$index_format''.
    */
-  {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, UL "%Y%m%d%h%M%s.G%P%p"},
+  {"msgid_format", DT_STR, R_NONE, UL &MsgIdFormat, "%Y%m%d%h%M%s.G%P%p"},
   /*
    ** .pp
    ** This is the format for the ``local part'' of the \fTMessage-Id:\fP header
@@ -1674,7 +1675,7 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP Please only change this setting if you know what you are doing.
    ** Also make sure to consult RFC2822 to produce technically \fIvalid\fP strings.
    */
-  {"narrow_tree", DT_BOOL, R_TREE|R_INDEX, OPTNARROWTREE, 0},
+  {"narrow_tree", DT_BOOL, R_TREE|R_INDEX, OPTNARROWTREE, "no" },
   /*
    ** .pp
    ** This variable, when \fIset\fP, makes the thread tree narrower, allowing
@@ -1682,7 +1683,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"news_cache_dir", DT_SYN, R_NONE, UL "nntp_cache_dir", 0},
-  {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, UL "~/.muttng"},
+  {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.muttng"},
   /*
    ** .pp
    ** Availability: NNTP
@@ -1695,8 +1696,8 @@ struct option_t MuttVars[] = {
    ** As for the header caching in connection with IMAP and/or Maildir,
    ** this drastically increases speed and lowers traffic.
    */
-  {"news_server", DT_SYN, R_NONE, UL "nntp_host", 0},
-  {"nntp_host", DT_STR, R_NONE, UL &NewsServer, 0},
+  {"news_server", DT_SYN, R_NONE, UL "nntp_host", 0 },
+  {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1718,7 +1719,7 @@ struct option_t MuttVars[] = {
    ** regardless of the file's permissions.
    */
   {"newsrc", DT_SYN, R_NONE, UL "nntp_newsrc", 0},
-  {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, UL "~/.newsrc"},
+  {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, "~/.newsrc"},
   /*
    ** .pp
    ** Availability: NNTP
@@ -1734,7 +1735,7 @@ struct option_t MuttVars[] = {
    ** %s      newsserver name
    ** .te
    */
-  {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, 1000},
+  {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1747,7 +1748,7 @@ struct option_t MuttVars[] = {
    ** If there're more articles than defined with $$nntp_context, all older ones
    ** will be removed/not shown in the index.
    */
-  {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, 1},
+  {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1756,7 +1757,7 @@ struct option_t MuttVars[] = {
    ** This variable controls whether or not descriptions for newsgroups
    ** are to be loaded when subscribing to a newsgroup.
    */
-  {"nntp_user", DT_STR, R_NONE, UL &NntpUser, UL ""},
+  {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""},
   /*
    ** .pp
    ** Availability: NNTP
@@ -1765,7 +1766,7 @@ struct option_t MuttVars[] = {
    ** Your login name on the NNTP server.  If \fIunset\fP and the server requires
    ** authentification, Mutt-ng will prompt you for your account name.
    */
-  {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, UL ""},
+  {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""},
   /*
    ** .pp
    ** Availability: NNTP
@@ -1778,7 +1779,7 @@ struct option_t MuttVars[] = {
    ** regardless of the file's permissions.
    */
   {"nntp_poll", DT_SYN, R_NONE, UL "nntp_mail_check", 0},
-  {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, 60},
+  {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1788,7 +1789,7 @@ struct option_t MuttVars[] = {
    ** article will cause a recheck for new news. If set to 0, Mutt-ng will
    ** recheck on each operation in index (stepping, read article, etc.).
    */
-  {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, M_ASKYES},
+  {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -1798,7 +1799,7 @@ struct option_t MuttVars[] = {
    ** was connection lost.
    */
 #endif
-  {"pager", DT_PATH, R_NONE, UL &Pager, UL "builtin"},
+  {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"},
   /*
    ** .pp
    ** This variable specifies which pager you would like to use to view
@@ -1811,7 +1812,7 @@ struct option_t MuttVars[] = {
    ** directly from the pager, and screen resizes cause lines longer than
    ** the screen width to be badly formatted in the help menu.
    */
-  {"pager_context", DT_NUM, R_NONE, UL &PagerContext, 0},
+  {"pager_context", DT_NUM, R_NONE, UL &PagerContext, "0" },
   /*
    ** .pp
    ** This variable controls the number of lines of context that are given
@@ -1819,7 +1820,7 @@ struct option_t MuttVars[] = {
    ** default, Mutt-ng will display the line after the last one on the screen
    ** at the top of the next page (0 lines of context).
    */
-  {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, UL "-%Z- %C/%m: %-20.20n   %s"},
+  {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, "-%Z- %C/%m: %-20.20n   %s"},
   /*
    ** .pp
    ** This variable controls the format of the one-line message ``status''
@@ -1827,7 +1828,7 @@ struct option_t MuttVars[] = {
    ** pager.  The valid sequences are listed in the ``$$index_format''
    ** section.
    */
-  {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, 0},
+  {"pager_index_lines", DT_NUM, R_PAGER, UL &PagerIndexLines, "0" },
   /*
    ** .pp
    ** Determines the number of lines of a mini-index which is shown when in
@@ -1842,14 +1843,14 @@ struct option_t MuttVars[] = {
    ** is less than \fIpager_index_lines\fP, then the index will only use as
    ** many lines as it needs.
    */
-  {"pager_stop", DT_BOOL, R_NONE, OPTPAGERSTOP, 0},
+  {"pager_stop", DT_BOOL, R_NONE, OPTPAGERSTOP, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the internal-pager will \fBnot\fP move to the next message
    ** when you are at the end of a message and invoke the \fInext-page\fP
    ** function.
    */
-  {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, 0},
+  {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, "no" },
   /*
    ** .pp
    ** Setting this variable will cause Mutt-ng to always attempt to
@@ -1860,7 +1861,7 @@ struct option_t MuttVars[] = {
    ** be overridden by use of the \fIsmime-menu\fP.
    ** (Crypto only)
    */
-  {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, 0},
+  {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, "no" },
   /*
    ** .pp
    ** Setting this variable will cause Mutt-ng to always attempt to PGP
@@ -1872,7 +1873,7 @@ struct option_t MuttVars[] = {
    ** settings can be overridden by use of the \fIsmime-menu\fP.
    ** (Crypto only)
    */
-  {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1},
+  {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" },
   /*
    ** .pp
    ** Setting this variable will cause Mutt-ng to ignore OpenPGP subkeys. Instead,
@@ -1880,14 +1881,14 @@ struct option_t MuttVars[] = {
    ** if you want to play interesting key selection games.
    ** (PGP only)
    */
-  {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, 1},
+  {"crypt_replyencrypt", DT_BOOL, R_NONE, OPTCRYPTREPLYENCRYPT, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, automatically PGP or OpenSSL encrypt replies to messages which are
    ** encrypted.
    ** (Crypto only)
    */
-  {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, 0},
+  {"crypt_replysign", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGN, "no" },
   /*
    ** .pp
    ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages which are
@@ -1896,7 +1897,7 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP this does not work on messages that are encrypted \fBand\fP signed!
    ** (Crypto only)
    */
-  {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, 0},
+  {"crypt_replysignencrypted", DT_BOOL, R_NONE, OPTCRYPTREPLYSIGNENCRYPTED, "no" },
   /*
    ** .pp
    ** If \fIset\fP, automatically PGP or OpenSSL sign replies to messages
@@ -1907,7 +1908,7 @@ struct option_t MuttVars[] = {
    ** to find out whether an encrypted message is also signed.
    ** (Crypto only)
    */
-  {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, 1},
+  {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will include a time stamp in the lines surrounding
@@ -1916,13 +1917,13 @@ struct option_t MuttVars[] = {
    ** you may \fIunset\fP this setting.
    ** (Crypto only)
    */
-  {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
+  {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will use a possibly-running gpg-agent process.
    ** (PGP only)
    */
-  {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, M_YES},
+  {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" },
   /*
    ** .pp
    ** If ``\fIyes\fP'', always attempt to verify PGP or S/MIME signatures.
@@ -1930,7 +1931,7 @@ struct option_t MuttVars[] = {
    ** If ``\fIno\fP'', never attempt to verify cryptographic signatures.
    ** (Crypto only)
    */
-  {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, 0},
+  {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" },
   /*
    ** .pp
    ** The default behaviour of Mutt-ng is to use PGP on all auto-sign/encryption
@@ -1943,7 +1944,7 @@ struct option_t MuttVars[] = {
    ** (Note that this variable can be overridden by unsetting $$crypt_autosmime.)
    ** (S/MIME only)
    */
-  {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, 1},
+  {"smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, "yes" },
   /*
    ** .pp
    ** This flag controls whether you want to be asked to enter a label
@@ -1951,7 +1952,7 @@ struct option_t MuttVars[] = {
    ** \fIset\fP by default.
    ** (S/MIME only)
    */
-  {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1},
+  {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" },
   /*
    ** .pp
    ** If \fIset\fP (default) this tells Mutt-ng to use the default key for decryption. Otherwise,
@@ -1959,7 +1960,7 @@ struct option_t MuttVars[] = {
    ** to determine the key to use. It will ask you to supply a key, if it can't find one.
    ** (S/MIME only)
    */
-  {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, UL "%4n %t%f %4l/0x%k %-4a %2c %u"},
+  {"pgp_entry_format", DT_STR, R_NONE, UL &PgpEntryFormat, "%4n %t%f %4l/0x%k %-4a %2c %u"},
   /*
    ** .pp
    ** This variable allows you to customize the PGP key selection menu to
@@ -1980,7 +1981,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** (PGP only)
    */
-  {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, 0},
+  {"pgp_good_sign", DT_RX, R_NONE, UL &PgpGoodSign, "" },
   /*
    ** .pp
    ** If you assign a text to this variable, then a PGP signature is only
@@ -1989,7 +1990,7 @@ struct option_t MuttVars[] = {
    ** even for bad signatures.
    ** (PGP only)
    */
-  {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, 1},
+  {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will check the exit code of the PGP subprocess when
@@ -1997,13 +1998,13 @@ struct option_t MuttVars[] = {
    ** subprocess failed.
    ** (PGP only)
    */
-  {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, 0},
+  {"pgp_long_ids", DT_BOOL, R_NONE, OPTPGPLONGIDS, "no" },
   /*
    ** .pp
    ** If \fIset\fP, use 64 bit PGP key IDs. \fIUnset\fP uses the normal 32 bit Key IDs.
    ** (PGP only)
    */
-  {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, 0},
+  {"pgp_retainable_sigs", DT_BOOL, R_NONE, OPTPGPRETAINABLESIG, "no" },
   /*
    ** .pp
    ** If \fIset\fP, signed and encrypted messages will consist of nested
@@ -2014,7 +2015,7 @@ struct option_t MuttVars[] = {
    ** removed, while the inner multipart/signed part is retained.
    ** (PGP only)
    */
-  {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, 0},
+  {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" },
   /*
    ** .pp
    ** This option controls whether Mutt-ng generates old-style inline
@@ -2032,7 +2033,7 @@ struct option_t MuttVars[] = {
    ** \fBdeprecated\fP.
    ** (PGP only)
    */
-  {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, 0},
+  {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" },
   /*
    ** .pp
    ** Setting this variable will cause Mutt-ng to always attempt to
@@ -2054,7 +2055,7 @@ struct option_t MuttVars[] = {
    ** (PGP only)
    ** 
    */
-  {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, 1},
+  {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will display non-usable keys on the PGP key selection
@@ -2062,7 +2063,7 @@ struct option_t MuttVars[] = {
    ** have been marked as ``disabled'' by the user.
    ** (PGP only)
    */
-  {"pgp_sign_as", DT_STR, R_NONE, UL &PgpSignAs, 0},
+  {"pgp_sign_as", DT_STR, R_NONE, UL &PgpSignAs, "" },
   /*
    ** .pp
    ** If you have more than one key pair, this option allows you to specify
@@ -2070,7 +2071,7 @@ struct option_t MuttVars[] = {
    ** keyid form to specify your key (e.g., ``\fT0x00112233\fP'').
    ** (PGP only)
    */
-  {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, 1},
+  {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will automatically encode PGP/MIME signed messages as
@@ -2079,14 +2080,14 @@ struct option_t MuttVars[] = {
    ** this if you know what you are doing.
    ** (PGP only)
    */
-  {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, 300},
+  {"pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, "300" },
   /*
    ** .pp
    ** The number of seconds after which a cached passphrase will expire if
    ** not used. Default: 300.
    ** (PGP only)
    */
-  {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, SORT_ADDRESS},
+  {"pgp_sort_keys", DT_SORT|DT_SORT_KEYS, R_NONE, UL &PgpSortKeys, "address" },
   /*
    ** .pp
    ** Specifies how the entries in the ``pgp keys'' menu are sorted. The
@@ -2103,7 +2104,7 @@ struct option_t MuttVars[] = {
    ** ``reverse-''.
    ** (PGP only)
    */
-  {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, M_ASKYES},
+  {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" },
   /*
    ** .pp
    ** This option controls whether Mutt-ng will prompt you for
@@ -2114,7 +2115,7 @@ struct option_t MuttVars[] = {
    ** \fBdeprecated\fP.
    ** (PGP only)
    */
-  {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, 0},
+  {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will automatically attempt to decrypt traditional PGP
@@ -2127,7 +2128,7 @@ struct option_t MuttVars[] = {
 
   /* XXX Default values! */
 
-  {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, 0},
+  {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" },
   /*
    ** .pp
    ** This format strings specifies a command which is used to decode 
@@ -2151,26 +2152,26 @@ struct option_t MuttVars[] = {
    ** alongside the documentation.
    ** (PGP only)
    */
-  {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
+  {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" },
   /*
    ** .pp
    ** This command is invoked whenever Mutt-ng will need public key information.
    ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format.
    ** (PGP only)
    */
-  {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, 0},
+  {"pgp_verify_command", DT_STR, R_NONE, UL &PgpVerifyCommand, "" },
   /*
    ** .pp
    ** This command is used to verify PGP signatures.
    ** (PGP only)
    */
-  {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, 0},
+  {"pgp_decrypt_command", DT_STR, R_NONE, UL &PgpDecryptCommand, "" },
   /*
    ** .pp
    ** This command is used to decrypt a PGP encrypted message.
    ** (PGP only)
    */
-  {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, 0},
+  {"pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, "" },
   /*
    ** .pp
    ** This format is used to create a old-style ``clearsigned'' PGP message.
@@ -2178,47 +2179,47 @@ struct option_t MuttVars[] = {
    ** Note that the use of this format is \fBstrongly\fP \fBdeprecated\fP.
    ** (PGP only)
    */
-  {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, 0},
+  {"pgp_sign_command", DT_STR, R_NONE, UL &PgpSignCommand, "" },
   /*
    ** .pp
    ** This command is used to create the detached PGP signature for a 
    ** multipart/signed PGP/MIME body part.
    ** (PGP only)
    */
-  {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, 0},
+  {"pgp_encrypt_sign_command", DT_STR, R_NONE, UL &PgpEncryptSignCommand, "" },
   /*
    ** .pp
    ** This command is used to both sign and encrypt a body part.
    ** (PGP only)
    */
-  {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, 0},
+  {"pgp_encrypt_only_command", DT_STR, R_NONE, UL &PgpEncryptOnlyCommand, "" },
   /*
    ** .pp
    ** This command is used to encrypt a body part without signing it.
    ** (PGP only)
    */
-  {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, 0},
+  {"pgp_import_command", DT_STR, R_NONE, UL &PgpImportCommand, "" },
   /*
    ** .pp
    ** This command is used to import a key from a message into 
    ** the user's public key ring.
    ** (PGP only)
    */
-  {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, 0},
+  {"pgp_export_command", DT_STR, R_NONE, UL &PgpExportCommand, "" },
   /*
    ** .pp
    ** This command is used to export a public key from the user's
    ** key ring.
    ** (PGP only)
    */
-  {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, 0},
+  {"pgp_verify_key_command", DT_STR, R_NONE, UL &PgpVerifyKeyCommand, "" },
   /*
    ** .pp
    ** This command is used to verify key information from the key selection
    ** menu.
    ** (PGP only)
    */
-  {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, 0},
+  {"pgp_list_secring_command", DT_STR, R_NONE, UL &PgpListSecringCommand, "" },
   /*
    ** .pp
    ** This command is used to list the secret key ring's contents.  The
@@ -2229,7 +2230,7 @@ struct option_t MuttVars[] = {
    ** with Mutt-ng.
    ** (PGP only)
    */
-  {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, 0},
+  {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" },
   /*
    ** .pp
    ** This command is used to list the public key ring's contents.  The
@@ -2240,7 +2241,7 @@ struct option_t MuttVars[] = {
    ** with Mutt-ng.
    ** (PGP only)
    */
-  {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, 1},
+  {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" },
   /*
    ** .pp
    ** Controls the handling of encrypted messages when forwarding a message.
@@ -2249,14 +2250,14 @@ struct option_t MuttVars[] = {
    ** ``$$mime_forward_decode'' is \fIunset\fP.
    ** (PGP only)
    */
-  {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, 300},
+  {"smime_timeout", DT_NUM, R_NONE, UL &SmimeTimeout, "300" },
   /*
    ** .pp
    ** The number of seconds after which a cached passphrase will expire if
    ** not used.
    ** (S/MIME only)
    */
-  {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, 0},
+  {"smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, "" },
   /*
    ** .pp
    ** This sets the algorithm that should be used for encryption.
@@ -2266,7 +2267,7 @@ struct option_t MuttVars[] = {
    ** If \fIunset\fP ``\fI3des\fP'' (TripleDES) is used.
    ** (S/MIME only)
    */
-  {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, 0},
+  {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" },
   /*
    ** .pp
    ** Since there is no pubring/secring as with PGP, Mutt-ng has to handle
@@ -2277,14 +2278,14 @@ struct option_t MuttVars[] = {
    ** edited. This one points to the location of the private keys.
    ** (S/MIME only)
    */
-  {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, 0},
+  {"smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, "" },
   /*
    ** .pp
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
    */
-  {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0},
+  {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" },
   /*
    ** .pp
    ** Since there is no pubring/secring as with PGP, Mutt-ng has to handle
@@ -2296,7 +2297,7 @@ struct option_t MuttVars[] = {
    ** the location of the certificates.
    ** (S/MIME only)
    */
-  {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, 0},
+  {"smime_decrypt_command", DT_STR, R_NONE, UL &SmimeDecryptCommand, "" },
   /*
    ** .pp
    ** This format string specifies a command which is used to decrypt
@@ -2322,27 +2323,27 @@ struct option_t MuttVars[] = {
    ** alongside the documentation.
    ** (S/MIME only)
    */
-  {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
+  {"smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, "" },
   /*
    ** .pp
    ** This command is used to verify S/MIME signatures of type \fTmultipart/signed\fP.
    ** (S/MIME only)
    */
-  {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, 0},
+  {"smime_verify_opaque_command", DT_STR, R_NONE, UL &SmimeVerifyOpaqueCommand, "" },
   /*
    ** .pp
    ** This command is used to verify S/MIME signatures of type
    ** \fTapplication/x-pkcs7-mime\fP.
    ** (S/MIME only)
    */
-  {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, 0},
+  {"smime_sign_command", DT_STR, R_NONE, UL &SmimeSignCommand, "" },
   /*
    ** .pp
    ** This command is used to created S/MIME signatures of type
    ** \fTmultipart/signed\fP, which can be read by all mail clients.
    ** (S/MIME only)
    */
-  {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, 0},
+  {"smime_sign_opaque_command", DT_STR, R_NONE, UL &SmimeSignOpaqueCommand, "" },
   /*
    ** .pp
    ** This command is used to created S/MIME signatures of type
@@ -2350,26 +2351,26 @@ struct option_t MuttVars[] = {
    ** clients supporting the S/MIME extension.
    ** (S/MIME only)
    */
-  {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, 0},
+  {"smime_encrypt_command", DT_STR, R_NONE, UL &SmimeEncryptCommand, "" },
   /*
    ** .pp
    ** This command is used to create encrypted S/MIME messages.
    ** (S/MIME only)
    */
-  {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, 0},
+  {"smime_pk7out_command", DT_STR, R_NONE, UL &SmimePk7outCommand, "" },
   /*
    ** .pp
    ** This command is used to extract PKCS7 structures of S/MIME signatures,
    ** in order to extract the public X509 certificate(s).
    ** (S/MIME only)
    */
-  {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, 0},
+  {"smime_get_cert_command", DT_STR, R_NONE, UL &SmimeGetCertCommand, "" },
   /*
    ** .pp
    ** This command is used to extract X509 certificates from a PKCS7 structure.
    ** (S/MIME only)
    */
-  {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, 0},
+  {"smime_get_signer_cert_command", DT_STR, R_NONE, UL &SmimeGetSignerCertCommand, "" },
   /*
    ** .pp
    ** This command is used to extract only the signers X509 certificate from a S/MIME
@@ -2377,13 +2378,13 @@ struct option_t MuttVars[] = {
    ** email's ``\fTFrom:\fP'' header field.
    ** (S/MIME only)
    */
-  {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, 0},
+  {"smime_import_cert_command", DT_STR, R_NONE, UL &SmimeImportCertCommand, "" },
   /*
    ** .pp
    ** This command is used to import a certificate via \fTsmime_keysng\fP.
    ** (S/MIME only)
    */
-  {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, 0},
+  {"smime_get_cert_email_command", DT_STR, R_NONE, UL &SmimeGetCertEmailCommand, "" },
   /*
    ** .pp
    ** This command is used to extract the mail address(es) used for storing
@@ -2391,7 +2392,7 @@ struct option_t MuttVars[] = {
    ** certificate was issued for the sender's mailbox).
    ** (S/MIME only)
    */
-  {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0},
+  {"smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, "" },
   /*
    ** .pp
    ** This is the default key-pair to use for signing. This must be set to the
@@ -2400,7 +2401,7 @@ struct option_t MuttVars[] = {
    */
 #if defined(USE_LIBESMTP)
   {"smtp_auth_username", DT_SYN, R_NONE, UL "smtp_user", 0},
-  {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, 0},
+  {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" },
   /*
    ** .pp
    ** Availability: SMTP
@@ -2410,7 +2411,7 @@ struct option_t MuttVars[] = {
    ** cause Mutt-ng to attempt to use SMTP AUTH when sending.
    */
   {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0},
-  {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, 0},
+  {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" },
   /*
    ** .pp
    ** Availability: SMTP
@@ -2424,7 +2425,7 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.  
    */
-  {"smtp_envelope", DT_STR, R_NONE, UL &SmtpEnvFrom, 0},
+  {"smtp_envelope", DT_STR, R_NONE, UL &SmtpEnvFrom, "" },
   /*
    ** .pp
    ** Availability: SMTP
@@ -2438,7 +2439,7 @@ struct option_t MuttVars[] = {
    ** as the envelope sender but only a particular one which may not be the same as the
    ** user's desired \fTFrom:\fP header.
    */
-  {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0},
+  {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" },
   /*
    ** .pp
    ** Availability: SMTP
@@ -2448,7 +2449,7 @@ struct option_t MuttVars[] = {
    ** to invoking the sendmail binary.  Setting this variable overrides the
    ** value of ``$$sendmail'', and any associated variables.
    */
-  {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, 25},
+  {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, "25" },
   /*
    ** .pp
    ** Availability: SMTP
@@ -2460,7 +2461,7 @@ struct option_t MuttVars[] = {
    ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP
    ** servers will probably desire 587, the mail submission port.
    */
-  {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, 0},
+  {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, "" },
   /*
    ** .pp
    ** Availability: SMTP (and SSL)
@@ -2477,7 +2478,7 @@ struct option_t MuttVars[] = {
 #endif
 #if defined(USE_SSL) || defined(USE_GNUTLS)
 #ifdef USE_SSL
-  {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0},
+  {"ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, "" },
   /*
    ** .pp
    ** Availability: SSL
@@ -2487,7 +2488,7 @@ struct option_t MuttVars[] = {
    ** key.
    */
 #endif /* USE_SSL */
-  {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, 0 },
+  {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" },
   /*
    ** .pp
    ** If this variable is \fIset\fP, mutt-ng will require that all connections
@@ -2496,7 +2497,7 @@ struct option_t MuttVars[] = {
    ** since it would otherwise have to abort the connection anyway. This
    ** option supersedes ``$$ssl_starttls''.
    */
-  {"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES},
+  {"ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, "yes" },
   /*
    ** .pp
    ** Availability: SSL or GNUTLS
@@ -2506,7 +2507,7 @@ struct option_t MuttVars[] = {
    ** advertising the capability. When \fIunset\fP, Mutt-ng will not attempt to
    ** use STARTTLS regardless of the server's capabilities.
    */
-  {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates"},
+  {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.mutt_certificates"},
   /*
    ** .pp
    ** Availability: SSL or GNUTLS
@@ -2525,7 +2526,7 @@ struct option_t MuttVars[] = {
    ** Example: \fTset certificate_file=~/.muttng/certificates\fP
    */
 # if defined(_MAKEDOC) || !defined (USE_GNUTLS)
-  {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1},
+  {"ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, "yes" },
   /*
    ** .pp
    ** Availability: SSL
@@ -2535,7 +2536,7 @@ struct option_t MuttVars[] = {
    ** system-wide certificate store when checking if server certificate 
    ** is signed by a trusted CA.
    */
-  {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, 0},
+  {"entropy_file", DT_PATH, R_NONE, UL &SslEntropyFile, "" },
   /*
    ** .pp
    ** Availability: SSL
@@ -2544,7 +2545,7 @@ struct option_t MuttVars[] = {
    ** The file which includes random data that is used to initialize SSL
    ** library functions.
    */
-  {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, 1},
+  {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "yes" },
   /*
    ** .pp
    ** Availability: SSL
@@ -2554,7 +2555,7 @@ struct option_t MuttVars[] = {
    ** SSL authentication process.
    */
 # endif /* _MAKEDOC || !USE_GNUTLS */
-  {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1},
+  {"ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, "yes" },
   /*
    ** .pp
    ** Availability: SSL or GNUTLS
@@ -2563,7 +2564,7 @@ struct option_t MuttVars[] = {
    ** This variables specifies whether to attempt to use SSLv3 in the
    ** SSL authentication process.
    */
-  {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, 1},
+  {"ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, "yes" },
   /*
    ** .pp
    ** Availability: SSL or GNUTLS
@@ -2573,7 +2574,7 @@ struct option_t MuttVars[] = {
    ** SSL authentication process.
    */
 # ifdef USE_GNUTLS
-  {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, 0},
+  {"ssl_min_dh_prime_bits", DT_NUM, R_NONE, UL &SslDHPrimeBits, "0" },
   /*
    ** .pp
    ** Availability: GNUTLS
@@ -2583,7 +2584,7 @@ struct option_t MuttVars[] = {
    ** for use in any Diffie-Hellman key exchange. A value of 0 will use
    ** the default from the GNUTLS library.
    */
-  {"ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, 0},
+  {"ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, "" },
   /*
    ** .pp
    ** This variable specifies a file containing trusted CA certificates.
@@ -2594,7 +2595,7 @@ struct option_t MuttVars[] = {
    */
 # endif /* USE_GNUTLS */
 # endif /* USE_SSL || USE_GNUTLS */
-  {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, 0},
+  {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" },
   /*
    ** .pp
    ** Used in connection with the \fIpipe-message\fP command and the ``tag-
@@ -2605,7 +2606,7 @@ struct option_t MuttVars[] = {
    ** In both cases the messages are piped in the current sorted order,
    ** and the ``$$pipe_sep'' separator is added after each message.
    */
-  {"pipe_decode", DT_BOOL, R_NONE, OPTPIPEDECODE, 0},
+  {"pipe_decode", DT_BOOL, R_NONE, OPTPIPEDECODE, "no" },
   /*
    ** .pp
    ** Used in connection with the \fIpipe-message\fP command.  When \fIunset\fP,
@@ -2613,14 +2614,14 @@ struct option_t MuttVars[] = {
    ** will weed headers and will attempt to PGP/MIME decode the messages
    ** first.
    */
-  {"pipe_sep", DT_STR, R_NONE, UL &PipeSep, UL "\n"},
+  {"pipe_sep", DT_STR, R_NONE, UL &PipeSep, "\n"},
   /*
    ** .pp
    ** The separator to add between messages when piping a list of tagged
    ** messages to an external Unix command.
    */
 #ifdef USE_POP
-  {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, UL 0},
+  {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" },
   /*
    ** .pp
    ** Availability: POP
@@ -2637,7 +2638,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP
    */
-  {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, 1},
+  {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" },
   /*
    ** .pp
    ** Availability: POP
@@ -2649,7 +2650,7 @@ struct option_t MuttVars[] = {
    ** fails, Mutt-ng will not connect to the POP server.
    */
   {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0},
-  {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, 60},
+  {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
   /*
    ** .pp
    ** Availability: POP
@@ -2658,7 +2659,7 @@ struct option_t MuttVars[] = {
    ** This variable configures how often (in seconds) POP should look for
    ** new mail.
    */
-  {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, M_ASKNO},
+  {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
   /*
    ** .pp
    ** Availability: POP
@@ -2668,7 +2669,7 @@ struct option_t MuttVars[] = {
    ** server when using the ``fetch-mail'' function.  When \fIunset\fP, Mutt-ng will
    ** download messages but also leave them on the POP server.
    */
-  {"pop_host", DT_STR, R_NONE, UL &PopHost, UL ""},
+  {"pop_host", DT_STR, R_NONE, UL &PopHost, ""},
   /*
    ** .pp
    ** Availability: POP
@@ -2683,7 +2684,7 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-  {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, 0},
+  {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" },
   /*
    ** .pp
    ** Availability: POP
@@ -2693,7 +2694,7 @@ struct option_t MuttVars[] = {
    ** for retrieving only unread messages from the POP server when using
    ** the ``fetch-mail'' function.
    */
-  {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, M_ASKYES},
+  {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, "ask-yes" },
   /*
    ** .pp
    ** Availability: POP
@@ -2702,7 +2703,7 @@ struct option_t MuttVars[] = {
    ** Controls whether or not Mutt-ng will try to reconnect to a POP server when the
    ** connection is lost.
    */
-  {"pop_user", DT_STR, R_NONE, UL &PopUser, 0},
+  {"pop_user", DT_STR, R_NONE, UL &PopUser, "" },
   /*
    ** .pp
    ** Availability: POP
@@ -2712,7 +2713,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable defaults to your user name on the local machine.
    */
-  {"pop_pass", DT_STR, R_NONE, UL &PopPass, UL ""},
+  {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""},
   /*
    ** .pp
    ** Availability: POP
@@ -2726,7 +2727,7 @@ struct option_t MuttVars[] = {
    ** regardless of the file's permissions.
    */
 #endif /* USE_POP */
-  {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, UL ""},
+  {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""},
   /*
    ** .pp
    ** Similar to the ``$$attribution'' variable, Mutt-ng will append this
@@ -2734,7 +2735,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"post_moderated", DT_SYN, R_NONE, UL "nntp_post_moderated", 0 },
-  {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, M_ASKYES},
+  {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -2748,13 +2749,13 @@ struct option_t MuttVars[] = {
    ** posting will not have any effect.
    */
 #endif
-  {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, M_ASKYES},
+  {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not messages are saved in the ``$$postponed''
    ** mailbox when you elect not to send immediately.
    */
-  {"postponed", DT_PATH, R_NONE, UL &Postponed, UL "~/postponed"},
+  {"postponed", DT_PATH, R_NONE, UL &Postponed, "~/postponed"},
   /*
    ** .pp
    ** Mutt-ng allows you to indefinitely ``$postpone sending a message'' which
@@ -2763,7 +2764,7 @@ struct option_t MuttVars[] = {
    ** variable.
    */
 #ifdef USE_SOCKET
-  {"preconnect", DT_STR, R_NONE, UL &Preconnect, UL 0},
+  {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" },
   /*
    ** .pp
    ** If \fIset\fP, a shell command to be executed if Mutt-ng fails to establish
@@ -2781,19 +2782,19 @@ struct option_t MuttVars[] = {
    ** remote machine without having to enter a password.
    */
 #endif /* USE_SOCKET */
-  {"print", DT_QUAD, R_NONE, OPT_PRINT, M_ASKNO},
+  {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" },
   /*
    ** .pp
    ** Controls whether or not Mutt-ng really prints messages.
    ** This is set to \fIask-no\fP by default, because some people
    ** accidentally hit ``p'' often.
    */
-  {"print_command", DT_PATH, R_NONE, UL &PrintCmd, UL "lpr"},
+  {"print_command", DT_PATH, R_NONE, UL &PrintCmd, "lpr"},
   /*
    ** .pp
    ** This specifies the command pipe that should be used to print messages.
    */
-  {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, 1},
+  {"print_decode", DT_BOOL, R_NONE, OPTPRINTDECODE, "yes" },
   /*
    ** .pp
    ** Used in connection with the print-message command.  If this
@@ -2804,7 +2805,7 @@ struct option_t MuttVars[] = {
    ** some advanced printer filter which is able to properly format
    ** e-mail messages for printing.
    */
-  {"print_split", DT_BOOL, R_NONE, OPTPRINTSPLIT, 0},
+  {"print_split", DT_BOOL, R_NONE, OPTPRINTSPLIT, "no" },
   /*
    ** .pp
    ** Used in connection with the print-message command.  If this option
@@ -2817,7 +2818,7 @@ struct option_t MuttVars[] = {
    ** Those who use the \fTenscript(1)\fP program's mail-printing mode will
    ** most likely want to set this option.
    */
-  {"prompt_after", DT_BOOL, R_NONE, OPTPROMPTAFTER, 1},
+  {"prompt_after", DT_BOOL, R_NONE, OPTPROMPTAFTER, "yes" },
   /*
    ** .pp
    ** If you use an \fIexternal\fP ``$$pager'', setting this variable will
@@ -2825,7 +2826,7 @@ struct option_t MuttVars[] = {
    ** than returning to the index menu.  If \fIunset\fP, Mutt-ng will return to the
    ** index menu when the external pager exits.
    */
-  {"query_command", DT_PATH, R_NONE, UL &QueryCmd, UL ""},
+  {"query_command", DT_PATH, R_NONE, UL &QueryCmd, ""},
   /*
    ** .pp
    ** This specifies the command that Mutt-ng will use to make external address
@@ -2833,7 +2834,7 @@ struct option_t MuttVars[] = {
    ** with the query string the user types.  See ``$query'' for more
    ** information.
    */
-  {"quit", DT_QUAD, R_NONE, OPT_QUIT, M_YES},
+  {"quit", DT_QUAD, R_NONE, OPT_QUIT, "yes" },
   /*
    ** .pp
    ** This variable controls whether ``quit'' and ``exit'' actually quit
@@ -2841,20 +2842,20 @@ struct option_t MuttVars[] = {
    ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
    ** prompted for confirmation when you try to quit.
    */
-  {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, 1},
+  {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" },
   /*
    ** .pp
    ** Controls whether or not empty lines will be quoted using
    ** ``$indent_string''.
    */
-  {"quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, 0},
+  {"quote_quoted", DT_BOOL, R_NONE, OPTQUOTEQUOTED, "no" },
   /*
    ** .pp
    ** Controls how quoted lines will be quoted. If \fIset\fP, one quote
    ** character will be added to the end of existing prefix.  Otherwise,
    ** quoted lines will be prepended by ``$indent_string''.
    */
-  {"quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, UL "^([ \t]*[|>:}#])+"},
+  {"quote_regexp", DT_RX, R_PAGER, UL &QuoteRegexp, "^([ \t]*[|>:}#])+"},
   /*
    ** .pp
    ** A regular expression used in the internal-pager to determine quoted
@@ -2865,7 +2866,7 @@ struct option_t MuttVars[] = {
    ** matches \fIexactly\fP the quote characters at the beginning of quoted
    ** lines.
    */
-  {"read_inc", DT_NUM, R_NONE, UL &ReadInc, 10},
+  {"read_inc", DT_NUM, R_NONE, UL &ReadInc, "10" },
   /*
    ** .pp
    ** If set to a value greater than 0, Mutt-ng will display which message it
@@ -2879,12 +2880,12 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the ``$$write_inc'' variable.
    */
-  {"read_only", DT_BOOL, R_NONE, OPTREADONLY, 0},
+  {"read_only", DT_BOOL, R_NONE, OPTREADONLY, "no" },
   /*
    ** .pp
    ** If set, all folders are opened in read-only mode.
    */
-  {"realname", DT_STR, R_BOTH, UL &Realname, 0},
+  {"realname", DT_STR, R_BOTH, UL &Realname, "" },
   /*
    ** .pp
    ** This variable specifies what ``real'' or ``personal'' name should be used
@@ -2896,7 +2897,7 @@ struct option_t MuttVars[] = {
    ** variable will \fInot\fP be used when the user has set a real name
    ** in the $$from variable.
    */
-  {"recall", DT_QUAD, R_NONE, OPT_RECALL, M_ASKYES},
+  {"recall", DT_QUAD, R_NONE, OPT_RECALL, "ask-yes" },
   /*
    ** .pp
    ** Controls whether or not Mutt-ng recalls postponed messages
@@ -2905,7 +2906,7 @@ struct option_t MuttVars[] = {
    ** Setting this variable to \fIyes\fP is not generally useful, and thus not
    ** recommended.
    */
-  {"record", DT_PATH, R_NONE, UL &Outbox, UL ""},
+  {"record", DT_PATH, R_NONE, UL &Outbox, ""},
   /*
    ** .pp
    ** This specifies the file into which your outgoing messages should be
@@ -2916,21 +2917,21 @@ struct option_t MuttVars[] = {
    ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and
    ** ``$$save_name'' variables, and the ``$fcc-hook'' command.
    */
-  {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, UL "^(re([\\[0-9\\]+])*|aw):[ \t]*"},
+  {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"},
   /*
    ** .pp
    ** A regular expression used to recognize reply messages when threading
    ** and replying. The default value corresponds to the English ``Re:'' and
    ** the German ``Aw:''.
    */
-  {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, 0},
+  {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, "no" },
   /*
    ** .pp
    ** If \fIunset\fP and you are replying to a message sent by you, Mutt-ng will
    ** assume that you want to reply to the recipients of that message rather
    ** than to yourself.
    */
-  {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, M_ASKYES},
+  {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, "ask-yes" },
   /*
    ** .pp
    ** If \fIset\fP, when replying to a message, Mutt-ng will use the address listed
@@ -2942,14 +2943,14 @@ struct option_t MuttVars[] = {
    ** header field to the list address and you want to send a private
    ** message to the author of a message.
    */
-  {"resolve", DT_BOOL, R_NONE, OPTRESOLVE, 1},
+  {"resolve", DT_BOOL, R_NONE, OPTRESOLVE, "yes" },
   /*
    ** .pp
    ** When set, the cursor will be automatically advanced to the next
    ** (possibly undeleted) message whenever a command that modifies the
    ** current message is executed.
    */
-  {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, 0},
+  {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, "no" },
   /*
    ** .pp
    ** This variable controls whether or not Mutt-ng will display the ``personal''
@@ -2967,7 +2968,7 @@ struct option_t MuttVars[] = {
    ** ``abd30425@somewhere.net.''  This is useful when the person's e-mail
    ** address is not human friendly (like CompuServe addresses).
    */
-  {"reverse_name", DT_BOOL, R_BOTH, OPTREVNAME, 0},
+  {"reverse_name", DT_BOOL, R_BOTH, OPTREVNAME, "no" },
   /*
    ** .pp
    ** It may sometimes arrive that you receive mail to a certain machine,
@@ -2979,7 +2980,7 @@ struct option_t MuttVars[] = {
    ** used doesn't match your alternates, the \fTFrom:\fP line will use
    ** your address on the current machine.
    */
-  {"reverse_realname", DT_BOOL, R_BOTH, OPTREVREAL, 1},
+  {"reverse_realname", DT_BOOL, R_BOTH, OPTREVREAL, "yes" },
   /*
    ** .pp
    ** This variable fine-tunes the behaviour of the $reverse_name feature.
@@ -2987,7 +2988,7 @@ struct option_t MuttVars[] = {
    ** possibly including eventual real names.  When it is \fIunset\fP, Mutt-ng will
    ** override any such real names with the setting of the $realname variable.
    */
-  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0},
+  {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "no" },
   /*
    ** .pp
    ** When this variable is \fIset\fP, Mutt-ng will decode RFC-2047-encoded MIME 
@@ -3007,14 +3008,14 @@ struct option_t MuttVars[] = {
    ** that Mutt-ng \fIgenerates\fP this kind of encoding.  Instead, Mutt-ng will
    ** unconditionally use the encoding specified in RFC 2231.
    */
-  {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, 0},
+  {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" },
   /*
    ** .pp
    ** If \fIset\fP, Mutt-ng will take the sender's full address when choosing a
    ** default folder for saving a mail. If ``$$save_name'' or ``$$force_name''
    ** is \fIset\fP too, the selection of the fcc folder will be changed as well.
    */
-  {"save_empty", DT_BOOL, R_NONE, OPTSAVEEMPTY, 1},
+  {"save_empty", DT_BOOL, R_NONE, OPTSAVEEMPTY, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, mailboxes which contain no saved messages will be removed
@@ -3024,7 +3025,7 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP This only applies to mbox and MMDF folders, Mutt-ng does not
    ** delete MH and Maildir directories.
    */
-  {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, 0},
+  {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, "no" },
   /*
    ** .pp
    ** This variable controls how copies of outgoing messages are saved.
@@ -3037,7 +3038,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the ``$$force_name'' variable.
    */
-  {"score", DT_BOOL, R_NONE, OPTSCORE, 1},
+  {"score", DT_BOOL, R_NONE, OPTSCORE, "yes" },
   /*
    ** .pp
    ** When this variable is \fIunset\fP, scoring is turned off.  This can
@@ -3045,7 +3046,7 @@ struct option_t MuttVars[] = {
    ** ``$$score_threshold_delete'' variable and friends are used.
    **
    */
-  {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, UL -1},
+  {"score_threshold_delete", DT_NUM, R_NONE, UL &ScoreThresholdDelete, "-1" },
   /*
    ** .pp
    ** Messages which have been assigned a score equal to or lower than the value
@@ -3053,13 +3054,13 @@ struct option_t MuttVars[] = {
    ** Mutt-ng scores are always greater than or equal to zero, the default setting
    ** of this variable will never mark a message for deletion.
    */
-  {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, 9999},
+  {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, "9999" },
   /* 
    ** .pp
    ** Messages which have been assigned a score greater than or equal to this 
    ** variable's value are automatically marked ``flagged''.
    */
-  {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, UL -1},
+  {"score_threshold_read", DT_NUM, R_NONE, UL &ScoreThresholdRead, "-1" },
   /*
    ** .pp
    ** Messages which have been assigned a score equal to or lower than the value
@@ -3067,7 +3068,7 @@ struct option_t MuttVars[] = {
    ** Mutt-ng scores are always greater than or equal to zero, the default setting
    ** of this variable will never mark a message read.
    */
-  {"send_charset", DT_STR, R_NONE, UL &SendCharset, UL "us-ascii:iso-8859-1:utf-8"},
+  {"send_charset", DT_STR, R_NONE, UL &SendCharset, "us-ascii:iso-8859-1:utf-8"},
   /*
    ** .pp
    ** A list of character sets for outgoing messages. Mutt-ng will use the
@@ -3078,14 +3079,14 @@ struct option_t MuttVars[] = {
    ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either
    ** instead of or after \fTiso-8859-1\fP.
    */
-  {"sendmail", DT_PATH, R_NONE, UL &Sendmail, UL SENDMAIL " -oem -oi"},
+  {"sendmail", DT_PATH, R_NONE, UL &Sendmail, SENDMAIL " -oem -oi"},
   /*
    ** .pp
    ** Specifies the program and arguments used to deliver mail sent by Mutt-ng.
    ** Mutt-ng expects that the specified program interprets additional
    ** arguments as recipient addresses.
    */
-  {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, 0},
+  {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" },
   /*
    ** .pp
    ** Specifies the number of seconds to wait for the ``$$sendmail'' process
@@ -3102,7 +3103,7 @@ struct option_t MuttVars[] = {
    ** process will be put in a temporary file.  If there is some error, you
    ** will be informed as to where to find the output.
    */
-  {"shell", DT_PATH, R_NONE, UL &Shell, 0},
+  {"shell", DT_PATH, R_NONE, UL &Shell, "" },
   /*
    ** .pp
    ** Command to use when spawning a subshell.  By default, the user's login
@@ -3110,7 +3111,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"save_unsubscribed", DT_SYN, R_NONE, UL "nntp_save_unsubscribed", 0 },
-  {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, 0},
+  {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -3122,7 +3123,7 @@ struct option_t MuttVars[] = {
 #endif
 #ifdef USE_NNTP
   {"show_new_news", DT_SYN, R_NONE, UL "nntp_show_new_news", 0 },
-  {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, 1},
+  {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -3134,7 +3135,7 @@ struct option_t MuttVars[] = {
    ** newsgroups will be checked.
    */
   {"show_only_unread", DT_SYN, R_NONE, UL "nntp_show_only_unread", 0 },
-  {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, 0},
+  {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" },
   /*
    ** .pp
    ** Availability: NNTP
@@ -3144,7 +3145,7 @@ struct option_t MuttVars[] = {
    ** will be displayed in the newsgroup browser.
    */
 #endif
-  {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, 1},
+  {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, "yes" },
   /*
    ** .pp
    ** If set, a line containing ``\fT-- \fP'' (dash, dash, space)
@@ -3156,7 +3157,7 @@ struct option_t MuttVars[] = {
    ** For example, Mutt-ng has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */
-  {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, 0},
+  {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, "no" },
   /*
    ** .pp
    ** If \fIset\fP, the signature will be included before any quoted or forwarded
@@ -3164,7 +3165,7 @@ struct option_t MuttVars[] = {
    ** unless you really know what you are doing, and are prepared to take
    ** some heat from netiquette guardians.
    */
-  {"signature", DT_PATH, R_NONE, UL &Signature, UL "~/.signature"},
+  {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"},
   /*
    ** .pp
    ** Specifies the filename of your signature, which is appended to all
@@ -3172,7 +3173,7 @@ struct option_t MuttVars[] = {
    ** assumed that filename is a shell command and input should be read from
    ** its stdout.
    */
-  {"signoff_string", DT_STR, R_NONE, UL &SignOffString, UL 0},
+  {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" },
   /*
    ** .pp
    ** If \fIset\fP, this string will be inserted before the signature. This is useful
@@ -3182,7 +3183,7 @@ struct option_t MuttVars[] = {
    ** witty quotes into your mails, better use a signature file instead of
    ** the signoff string.
    */
-  {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, UL "~f %s | ~s %s"},
+  {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, "~f %s | ~s %s"},
   /*
    ** .pp
    ** Specifies how Mutt-ng should expand a simple search into a real search
@@ -3195,7 +3196,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fT~f joe | ~s joe\fP
    */
-  {"smart_wrap", DT_BOOL, R_PAGER, OPTWRAP, 1},
+  {"smart_wrap", DT_BOOL, R_PAGER, OPTWRAP, "yes" },
   /*
    ** .pp
    ** Controls the display of lines longer than the screen width in the
@@ -3203,14 +3204,14 @@ struct option_t MuttVars[] = {
    ** If \fIunset\fP, lines are simply wrapped at the screen edge. Also see the
    ** ``$$markers'' variable.
    */
-  {"smileys", DT_RX, R_PAGER, UL &Smileys, UL "(>From )|(:[-^]?[][)(><}{|/DP])"},
+  {"smileys", DT_RX, R_PAGER, UL &Smileys, "(>From )|(:[-^]?[][)(><}{|/DP])"},
   /*
    ** .pp
    ** The \fIpager\fP uses this variable to catch some common false
    ** positives of ``$$quote_regexp'', most notably smileys in the beginning
    ** of a line
    */
-  {"sleep_time", DT_NUM, R_NONE, UL &SleepTime, 1},
+  {"sleep_time", DT_NUM, R_NONE, UL &SleepTime, "1" },
   /*
    ** .pp
    ** Specifies time, in seconds, to pause while displaying certain informational
@@ -3218,7 +3219,7 @@ struct option_t MuttVars[] = {
    ** messages from the current folder.  The default is to pause one second, so 
    ** a value of zero for this option suppresses the pause.
    */
-  {"sort", DT_SORT, R_INDEX|R_RESORT, UL &Sort, SORT_DATE},
+  {"sort", DT_SORT, R_INDEX|R_RESORT, UL &Sort, "date" },
   /*
    ** .pp
    ** Specifies how to sort messages in the \fIindex\fP menu.  Valid values
@@ -3240,7 +3241,7 @@ struct option_t MuttVars[] = {
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: \fTset sort=reverse-date-sent\fP).
    */
-  {"sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS},
+  {"sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, "alias" },
   /*
    ** .pp
    ** Specifies how the entries in the ``alias'' menu are sorted.  The
@@ -3252,7 +3253,7 @@ struct option_t MuttVars[] = {
    ** .  unsorted (leave in order specified in .muttrc)
    ** .te
    */
-  {"sort_aux", DT_SORT|DT_SORT_AUX, R_INDEX|R_RESORT_BOTH, UL &SortAux, SORT_DATE},
+  {"sort_aux", DT_SORT|DT_SORT_AUX, R_INDEX|R_RESORT_BOTH, UL &SortAux, "date" },
   /*
    ** .pp
    ** When sorting by threads, this variable controls how threads are sorted
@@ -3272,7 +3273,7 @@ struct option_t MuttVars[] = {
    ** (which is not the right thing to do, but kept to not break any existing
    ** configuration setting).
    */
-  {"sort_browser", DT_SORT|DT_SORT_BROWSER, R_NONE, UL &BrowserSort, SORT_ALPHA},
+  {"sort_browser", DT_SORT|DT_SORT_BROWSER, R_NONE, UL &BrowserSort, "alpha" },
   /*
    ** .pp
    ** Specifies how to sort entries in the file browser.  By default, the
@@ -3288,7 +3289,7 @@ struct option_t MuttVars[] = {
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: \fTset sort_browser=reverse-date\fP).
    */
-  {"sort_re", DT_BOOL, R_INDEX|R_RESORT|R_RESORT_INIT, OPTSORTRE, 1},
+  {"sort_re", DT_BOOL, R_INDEX|R_RESORT|R_RESORT_INIT, OPTSORTRE, "yes" },
   /*
    ** .pp
    ** This variable is only useful when sorting by threads with
@@ -3300,7 +3301,7 @@ struct option_t MuttVars[] = {
    ** Mutt-ng will attach the message whether or not this is the case,
    ** as long as the non-``$$reply_regexp'' parts of both messages are identical.
    */
-  {"spam_separator", DT_STR, R_NONE, UL &SpamSep, UL ","},
+  {"spam_separator", DT_STR, R_NONE, UL &SpamSep, ","},
   /*
    ** .pp
    ** ``$spam_separator'' controls what happens when multiple spam headers
@@ -3309,7 +3310,7 @@ struct option_t MuttVars[] = {
    ** match will append to the previous, using ``$spam_separator'' as a
    ** separator.
    */
-  {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, 0},
+  {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" },
   /*
    ** .pp
    ** If your spool mailbox is in a non-default place where Mutt-ng cannot find
@@ -3317,7 +3318,7 @@ struct option_t MuttVars[] = {
    ** automatically set this variable to the value of the environment
    ** variable $$$MAIL if it is not set.
    */
-  {"status_chars", DT_STR, R_BOTH, UL &StChars, UL "-*%A"},
+  {"status_chars", DT_STR, R_BOTH, UL &StChars, "-*%A"},
   /*
    ** .pp
    ** Controls the characters used by the ``\fT%r\fP'' indicator in
@@ -3331,7 +3332,7 @@ struct option_t MuttVars[] = {
    ** opened in attach-message mode (Certain operations like composing
    ** a new mail, replying, forwarding, etc. are not permitted in this mode).
    */
-  {"status_format", DT_STR, R_BOTH, UL &Status, UL "-%r-Mutt-ng: %f [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?]---(%s/%S)-%>-(%P)---"},
+  {"status_format", DT_STR, R_BOTH, UL &Status, "-%r-Mutt-ng: %f [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?]---(%s/%S)-%>-(%P)---"},
   /*
    ** .pp
    ** Controls the format of the status line displayed in the \fIindex\fP
@@ -3404,13 +3405,13 @@ struct option_t MuttVars[] = {
    ** will replace any dots in the expansion by underscores. This might be helpful 
    ** with IMAP folders that don't like dots in folder names.
    */
-  {"status_on_top", DT_BOOL, R_BOTH, OPTSTATUSONTOP, 0},
+  {"status_on_top", DT_BOOL, R_BOTH, OPTSTATUSONTOP, "no" },
   /*
    ** .pp
    ** Setting this variable causes the ``status bar'' to be displayed on
    ** the first line of the screen rather than near the bottom.
    */
-  {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, 1},
+  {"strict_mailto", DT_BOOL, R_NONE, OPTSTRICTMAILTO, "yes" },
   /*
    **
    ** .pp
@@ -3424,7 +3425,7 @@ struct option_t MuttVars[] = {
    ** ``X-Mailto-'' and the message including headers will be shown in the editor
    ** regardless of what ``$$edit_headers'' is set to.
    **/
-  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, 1},
+  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, non MIME-compliant messages that doesn't have any
@@ -3437,7 +3438,7 @@ struct option_t MuttVars[] = {
    ** and *text to a single space to prevent the display of MIME-encoded
    ** ``\fTSubject:\fP'' header field from being devided into multiple lines.
    */
-  {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0},
+  {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" },
   /*
    ** .pp
    ** If \fIset\fP, threading will only make use of the ``\fTIn-Reply-To:\fP'' and
@@ -3447,35 +3448,35 @@ struct option_t MuttVars[] = {
    ** personal mailbox where you might have several unrelated messages with
    ** the subject ``hi'' which will get grouped together.
    */
-  {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, 0},
+  {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, "no" },
   /**
   ** .pp
   ** When \fIset\fP, mutt-ng will remove the trailing part of the ``\fTSubject:\fP''
   ** line which matches $$strip_was_regex when replying. This is useful to
   ** properly react on subject changes and reduce ``subject noise.'' (esp. in Usenet)
   **/
-  {"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, UL "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"},
+  {"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"},
   /**
   ** .pp
   ** When non-empty and $$strip_was is \fIset\fP, mutt-ng will remove this
   ** trailing part of the ``Subject'' line when replying if it won't be empty
   ** afterwards.
   **/
-  {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, 0},
+  {"stuff_quoted", DT_BOOL, R_BOTH, OPTSTUFFQUOTED, "no" },
   /*
    ** .pp
    ** If \fIset\fP, attachments with flowed format will have their quoting ``stuffed'',
    ** i.e. a space will be inserted between the quote characters and the actual
    ** text.
    */
-  {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, 1},
+  {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, "yes" },
   /*
    ** .pp
    ** When \fIunset\fP, Mutt-ng won't stop when the user presses the terminal's
    ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Mutt-ng
    ** inside an xterm using a command like ``\fTxterm -e muttng\fP.''
    */
-  {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, 0},
+  {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will generate \fTtext/plain; format=flowed\fP attachments.
@@ -3485,13 +3486,13 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Note that $$indent_string is ignored when this option is set.
    */
-  {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, 0},
+  {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, "no" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng uses the date received rather than the date sent
    ** to thread messages by subject.
    */
-  {"thorough_search", DT_BOOL, R_NONE, OPTTHOROUGHSRC, 0},
+  {"thorough_search", DT_BOOL, R_NONE, OPTTHOROUGHSRC, "no" },
   /*
    ** .pp
    ** Affects the \fT~b\fP and \fT~h\fP search operations described in
@@ -3499,13 +3500,13 @@ struct option_t MuttVars[] = {
    ** messages to be searched are decoded before searching.  If \fIunset\fP,
    ** messages are searched as they appear in the folder.
    */
-  {"tilde", DT_BOOL, R_PAGER, OPTTILDE, 0},
+  {"tilde", DT_BOOL, R_PAGER, OPTTILDE, "no" },
   /*
    ** .pp
    ** When \fIset\fP, the internal-pager will pad blank lines to the bottom of the
    ** screen with a tilde (~).
    */
-  {"timeout", DT_NUM, R_NONE, UL &Timeout, 600},
+  {"timeout", DT_NUM, R_NONE, UL &Timeout, "600" },
   /*
    ** .pp
    ** This variable controls the \fInumber of seconds\fP Mutt-ng will wait
@@ -3513,7 +3514,7 @@ struct option_t MuttVars[] = {
    ** checking for new mail.  A value of zero or less will cause Mutt-ng
    ** to never time out.
    */
-  {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, 0},
+  {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, "" },
   /*
    ** .pp
    ** This variable allows you to specify where Mutt-ng will place its
@@ -3521,7 +3522,7 @@ struct option_t MuttVars[] = {
    ** this variable is not set, the environment variable \fT$$$TMPDIR\fP is
    ** used.  If \fT$$$TMPDIR\fP is not set then "\fT/tmp\fP" is used.
    */
-  {"to_chars", DT_STR, R_BOTH, UL &Tochars, UL " +TCFL"},
+  {"to_chars", DT_STR, R_BOTH, UL &Tochars, " +TCFL"},
   /*
    ** .pp
    ** Controls the character used to indicate mail addressed to you.  The
@@ -3535,7 +3536,7 @@ struct option_t MuttVars[] = {
    ** by \fIyou\fP.  The sixth character is used to indicate when a mail
    ** was sent to a mailing-list you're subscribe to (default: L).
    */
-  {"trash", DT_PATH, R_NONE, UL &TrashPath, 0},
+  {"trash", DT_PATH, R_NONE, UL &TrashPath, "" },
   /*
    ** .pp
    ** If \fIset\fP, this variable specifies the path of the trash folder where the
@@ -3546,7 +3547,7 @@ struct option_t MuttVars[] = {
    ** deleted, so that there is no way to recover mail.
    */
 #ifdef USE_SOCKET
-  {"tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0},
+  {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" },
   /*
    ** .pp
    ** Setting this variable will cause Mutt-ng to open a pipe to a command
@@ -3559,13 +3560,13 @@ struct option_t MuttVars[] = {
    ** machine without having to enter a password.
    */
 #endif
-  {"umask", DT_NUM, R_NONE, UL &Umask, 0077},
+  {"umask", DT_NUM, R_NONE, UL &Umask, "0077" },
   /*
    ** .pp
    ** This sets the umask that will be used by Mutt-ng when creating all
    ** kinds of files. If \fIunset\fP, the default value is \fT077\fP.
    */
-  {"use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, 0},
+  {"use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, "no" },
   /*
    ** .pp
    ** \fBWarning:\fP do not set this variable unless you are using a version
@@ -3577,14 +3578,14 @@ struct option_t MuttVars[] = {
    ** flag when sending 8-bit messages to enable ESMTP negotiation or tell
    ** libESMTP to do so.
    */
-  {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, 1},
+  {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will qualify all local addresses (ones without the
    ** @host portion) with the value of ``$$hostname''.  If \fIunset\fP, no
    ** addresses will be qualified.
    */
-  {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, 1},
+  {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will generate the ``\fTFrom:\fP'' header field when
@@ -3593,7 +3594,7 @@ struct option_t MuttVars[] = {
    ** command.
    */
 #ifdef HAVE_LIBIDN
-  {"use_idn", DT_BOOL, R_BOTH, OPTUSEIDN, 1},
+  {"use_idn", DT_BOOL, R_BOTH, OPTUSEIDN, "yes" },
   /*
    ** .pp
    ** Availability: IDN
@@ -3606,7 +3607,7 @@ struct option_t MuttVars[] = {
    */
 #endif /* HAVE_LIBIDN */
 #ifdef HAVE_GETADDRINFO
-  {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, 1},
+  {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will look for IPv6 addresses of hosts it tries to
@@ -3614,20 +3615,21 @@ struct option_t MuttVars[] = {
    ** Normally, the default should work.
    */
 #endif /* HAVE_GETADDRINFO */
-  {"user_agent", DT_BOOL, R_NONE, OPTXMAILER, 1},
+  {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 },
+  {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will add a ``\fTUser-Agent:\fP'' header to outgoing
    ** messages, indicating which version of Mutt-ng was used for composing
    ** them.
    */
-  {"visual", DT_PATH, R_NONE, UL &Visual, 0},
+  {"visual", DT_PATH, R_NONE, UL &Visual, "" },
   /*
    ** .pp
    ** Specifies the visual editor to invoke when the \fI~v\fP command is
    ** given in the builtin editor.
    */
-  {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, 1},
+  {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, "yes" },
   /*
    ** .pp
    ** Controls whether Mutt-ng will ask you to press a key after \fIshell-
@@ -3641,13 +3643,13 @@ struct option_t MuttVars[] = {
    ** When \fIset\fP, Mutt-ng will always ask for a key. When \fIunset\fP, Mutt-ng will wait
    ** for a key only if the external command returned a non-zero status.
    */
-  {"weed", DT_BOOL, R_NONE, OPTWEED, 1},
+  {"weed", DT_BOOL, R_NONE, OPTWEED, "yes" },
   /*
    ** .pp
    ** When \fIset\fP, Mutt-ng will weed headers when displaying, forwarding,
    ** printing, or replying to messages.
    */
-  {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, 1},
+  {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, "yes" },
   /*
    ** .pp
    ** Controls whether searches wrap around the end of the mailbox.
@@ -3655,13 +3657,13 @@ struct option_t MuttVars[] = {
    ** When \fIset\fP, searches will wrap around the first (or last) message. When
    ** \fIunset\fP, searches will not wrap.
    */
-  {"wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, 0},
+  {"wrapmargin", DT_NUM, R_PAGER, UL &WrapMargin, "0" },
   /*
    ** .pp
    ** Controls the size of the margin remaining at the right side of
    ** the terminal when Mutt-ng's pager does smart wrapping.
    */
-  {"write_inc", DT_NUM, R_NONE, UL &WriteInc, 10},
+  {"write_inc", DT_NUM, R_NONE, UL &WriteInc, "10" },
   /*
    ** .pp
    ** When writing a mailbox, a message will be printed every
@@ -3670,27 +3672,27 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the ``$$read_inc'' variable.
    */
-  {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1},
+  {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, "yes" },
   /*
    ** .pp
    ** Controls whether Mutt-ng writes out the Bcc header when preparing
    ** messages to be sent.  Exim users may wish to \fIunset\fP this.
    */
-  {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, UL "M%?n?AIL&ail?"},
+  {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, "M%?n?AIL&ail?"},
   /*
    ** .pp
    ** Controls the format of the X11 icon title, as long as $$xterm_set_titles
    ** is \fIset\fP. This string is identical in formatting to the one used by
    ** ``$$status_format''.
    */
-  {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, 0},
+  {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, "no" },
   /*
    ** .pp
    ** Controls whether Mutt-ng sets the xterm title bar and icon name
    ** (as long as you're in an appropriate terminal). The default must
    ** be \fIunset\fP to force in the validity checking.
    */
-  {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, UL "" },
+  {"xterm_leave", DT_STR, R_BOTH, UL &XtermLeave, "" },
   /*
    ** .pp
    ** If $$xterm_set_titles is \fIset\fP, this string will be used to
@@ -3704,7 +3706,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fTset xterm_leave = "`test x$$$DISPLAY != x && xprop -id $$$WINDOWID | grep WM_NAME | cut -d '"' -f 2`"\fP
    */
-  {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, UL "Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?"},
+  {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, "Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?"},
   /*
    ** .pp
    ** Controls the format of the title bar of the xterm provided that
@@ -3713,7 +3715,7 @@ struct option_t MuttVars[] = {
    */
 #ifdef USE_NNTP
   {"x_comment_to", DT_SYN, R_NONE, UL "nntp_x_comment_to", 0},
-  {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, 0},
+  {"nntp_x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, "no" },
   /*
    ** .pp
    ** Availability: NNTP
diff --git a/makedoc.c b/makedoc.c
index 279168b..f739e23 100644
--- a/makedoc.c
+++ b/makedoc.c
@@ -114,7 +114,6 @@ static int print_it (int, char *, int);
 static void print_confline (const char *, int, const char *);
 static void handle_confline (char *);
 static void makedoc (FILE *, FILE *);
-static void pretty_default (char *, size_t, const char *, int);
 static int sgml_fputc (int);
 static int sgml_fputs (const char *);
 static void add_var (const char *);
@@ -439,7 +438,6 @@ static void handle_confline (char *s)
 {
   char varname[BUFFSIZE];
   char buff[BUFFSIZE];
-  char tmp[BUFFSIZE];
   int type;
 
   char val[BUFFSIZE];
@@ -507,80 +505,20 @@ static void handle_confline (char *s)
       return;
   }
 
-  memset (tmp, 0, sizeof (tmp));
+  memset (val, 0, sizeof (val));
 
   do {
     if (!strcmp (buff, "}"))
       break;
 
-    strncpy (tmp + STRLEN (tmp), buff, sizeof (tmp) - STRLEN (tmp));
+    strncpy (val + STRLEN (val), buff, sizeof (val) - STRLEN (val));
   }
   while ((s = get_token (buff, sizeof (buff), s)));
 
-  pretty_default (val, sizeof (val), tmp, type);
   add_var (varname);
   print_confline (varname, type, val);
 }
 
-static void pretty_default (char *t, size_t l, const char *s, int type)
-{
-  memset (t, 0, l);
-  l--;
-
-  switch (type) {
-  case DT_QUAD:
-    {
-      if (!strcasecmp (s, "M_YES"))
-        strncpy (t, "yes", l);
-      else if (!strcasecmp (s, "M_NO"))
-        strncpy (t, "no", l);
-      else if (!strcasecmp (s, "M_ASKYES"))
-        strncpy (t, "ask-yes", l);
-      else if (!strcasecmp (s, "M_ASKNO"))
-        strncpy (t, "ask-no", l);
-      break;
-    }
-  case DT_BOOL:
-    {
-      if (atoi (s))
-        strncpy (t, "yes", l);
-      else
-        strncpy (t, "no", l);
-      break;
-    }
-  case DT_SORT:
-    {
-      /* heuristic! */
-      strncpy (t, s + 5, l);
-      for (; *t; t++)
-        *t = tolower ((unsigned char) *t);
-      break;
-    }
-  case DT_MAGIC:
-    {
-      /* heuristic! */
-      strncpy (t, s + 2, l);
-      for (; *t; t++)
-        *t = tolower ((unsigned char) *t);
-      break;
-    }
-  case DT_STR:
-  case DT_RX:
-  case DT_ADDR:
-  case DT_PATH:
-    {
-      if (!strcmp (s, "0"))
-        break;
-      /* fallthrough */
-    }
-  default:
-    {
-      strncpy (t, s, l);
-      break;
-    }
-  }
-}
-
 static void char_to_escape (char *dest, unsigned int c)
 {
   switch (c) {
diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 7b3ada3..a7f65ce 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -280,10 +280,17 @@ static void do_dsn_ret (smtp_message_t message) {
 }
 
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-int mutt_libesmtp_check_usetls (const char* val) {
+int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
+                                char* errbuf, size_t errlen) {
+  char* val = (char*) p;
+  if (!val || !*val)
+    return (1);
   if (str_ncmp (val, "enabled", 7) != 0 &&
-      str_ncmp (val, "required", 8) != 0)
+      str_ncmp (val, "required", 8) != 0) {
+    if (errbuf)
+      snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option);
     return (0);
+  }
   return (1);
 }
 #endif
diff --git a/mutt_libesmtp.h b/mutt_libesmtp.h
index 99d67da..0592002 100644
--- a/mutt_libesmtp.h
+++ b/mutt_libesmtp.h
@@ -11,7 +11,8 @@
 #define _MUTT_LIBESMTP_H
 
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-int mutt_libesmtp_check_usetls (const char*);
+int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
+                                char* errbuf, size_t errlen);
 #endif
 
 int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
diff --git a/protos.h b/protos.h
index 27f829c..6d23e83 100644
--- a/protos.h
+++ b/protos.h
@@ -214,7 +214,7 @@ int mutt_complete (char *, size_t);
 int mutt_copy_body (FILE *, BODY **, BODY *);
 
 int mutt_display_message (HEADER * h);
-int mutt_dump_variables (void);
+int mutt_dump_variables (int full);
 int mutt_edit_message (CONTEXT *, HEADER *);
 int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags);
 int mutt_chscmp (const char *s, const char *chs);
diff --git a/rfc2047.c b/rfc2047.c
index 50304c6..2d57d6a 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -17,6 +17,7 @@
 #include "mime.h"
 #include "charset.h"
 #include "rfc2047.h"
+#include "thread.h"
 
 #include "lib/mem.h"
 #include "lib/str.h"
@@ -818,13 +819,7 @@ void rfc2047_decode_envelope (ENVELOPE* e) {
   rfc2047_decode_adrlist (e->sender);
 
   if (e->subject) {
-    regmatch_t pmatch[1];
-
     rfc2047_decode (&e->subject);
-
-    if (regexec (ReplyRegexp.rx, e->subject, 1, pmatch, 0) == 0)
-      e->real_subj = e->subject + pmatch[0].rm_eo;
-    else
-      e->real_subj = e->subject;
+    mutt_adjust_subject (e);
   }
 }
diff --git a/thread.c b/thread.c
index 0f93794..cd99914 100644
--- a/thread.c
+++ b/thread.c
@@ -1305,3 +1305,24 @@ int mutt_link_threads (HEADER * cur, HEADER * last, CONTEXT * ctx)
 
   return changed;
 }
+
+void mutt_adjust_subject (ENVELOPE* e) {
+  regmatch_t pmatch[1];
+
+  if (e && e->subject) {
+    if (regexec (ReplyRegexp.rx, e->subject, 1, pmatch, 0) == 0)
+      e->real_subj = e->subject + pmatch[0].rm_eo;
+    else
+      e->real_subj = e->subject;
+  }
+}
+
+void mutt_adjust_all_subjects (void) {
+  int i = 0;
+
+  if (!Context || !Context->msgcount)
+    return;
+
+  for (i = 0; i < Context->msgcount; i++)
+    mutt_adjust_subject (Context->hdrs[i]->env);
+}
diff --git a/thread.h b/thread.h
index 03e725c..4af9027 100644
--- a/thread.h
+++ b/thread.h
@@ -38,4 +38,9 @@ HASH *mutt_make_subj_hash (CONTEXT *);
 int mutt_link_threads (HEADER *, HEADER *, CONTEXT *);
 void mutt_break_thread (HEADER *);
 
+/* computes an envelope's real_subj from subj */
+void mutt_adjust_subject (ENVELOPE* e);
+/* does mutt_adjust_subject() for messages in Context */
+void mutt_adjust_all_subjects (void);
+
 #endif /* !_MUTT_THREAD_H */