From 0f3e091d19c9ed02a522a5e8d9efc9ec725b5382 Mon Sep 17 00:00:00 2001
From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Thu, 18 Aug 2005 12:24:25 +0000
Subject: [PATCH] Rocco Rutte: - add Security chapter to manual

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@408 e385b8ad-14ed-0310-8656-cc95a2468c6d
---
 doc/manual.sgml.head |  155 +++
 doc/manual.txt       | 2348 ++++++++++++++++++++++--------------------
 2 files changed, 1393 insertions(+), 1110 deletions(-)

diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 6469349..eace2af 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -4298,6 +4298,161 @@ muttrc.
 
 <!--}}}--> 
 
+<chapt>Security Considerations <!--{{{--> 
+
+  <p>First of all, mutt-ng contains no security holes included by
+  intention but may contain unknown security holes. As a consequence,
+  please run mutt-ng only with as few permissions as possible.
+
+  <p>Please do not run mutt-ng as the super user.
+
+  <p>When configuring mutt-ng, there're some points to note about secure
+  setups.
+
+  <p>In practice, mutt-ng can be easily made as vulnerable as even the
+  most insecure mail user agents (in their default configuration) just
+  by changing mutt-ng's configuration files: it then can execute
+  arbitrary programs and scripts attached to messages, send out private
+  data on its own, etc. Although this is not believed to the common type
+  of setup, please read this chapter carefully.
+
+  <sect>Passwords <!--{{{--> 
+
+    <p>Although mutt-ng can be told the various passwords for accounts,
+    please never store passwords in configuration files. Besides the
+    fact that the system's operator can always read them, you could
+    forget to replace the actual password with asterisks when reporting
+    a bug or asking for help via, for example, a mailing list so that
+    your mail including your password could be archived by internet
+    search engines, etc. Please never store passwords on disk.
+
+  <!--}}}-->
+
+  <sect>Temporary Files <!--{{{--> 
+
+    <p>Mutt-ng uses many temporary files for viewing messages, verifying
+    digital signatures, etc. The <ref id="umask" name="&dollar;umask">
+    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 <ref id="tmpdir" name="&dollar;tmpdir"> variable.
+
+  <!--}}}-->
+
+  <sect>Information Leaks <!--{{{--> 
+
+  <sect1>Message-ID: headers <!--{{{--> 
+
+    <p>In the default configuration, mutt-ng will leak some information
+    to the outside world when sending messages: the generation of
+    <tt/Message-ID:/ headers includes a 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 <tt/%P/ expando from the
+    default setting of the <ref id="msgid_format"
+    name="&dollar;msgid&lowbar;format"> variable. Please make sure that
+    you really know how local parts of these <tt/Message-ID:/ headers
+    are composed.
+
+  <!--}}}-->
+
+  <sect1>mailto:-style links <!--{{{--> 
+
+    <p>As mutt-ng be can be set up to be the mail client to handle
+    <tt/mailto:/ style links in websites, there're security
+    considerations, too. To keep the old behavior by 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 <ref id="edit_headers"
+    name="&dollar;edit&lowbar;headers"> variable is <em/unset/, i.e. the
+    user doesn't want to see header fields while editing the message.
+
+    <p>For example, following a link like
+
+    <verb>
+mailto:joe@host?Attach=~/.gnupg/secring.gpg</verb>
+
+    will send out the user's private gnupg keyring to <tt/joe@host/ if
+    the user doesn't follow the information on screen carefully
+    enough.
+
+    <p>When <em/unsetting/ the <ref id="strict_mailto"
+    name="&dollar;strict&lowbar;mailto"> variable, mutt-ng will
+
+    <itemize>
+
+      <item>be less strict when interpreting these links by
+        prepending a <tt/X-Mailto-/ string to all header fields
+        embedded in such a link <em/and/
+
+      <item>turn on the <ref id="edit_headers"
+        name="&dollar;edit&lowbar;headers"> variable by
+        force to let the user see all the headers
+        (because they still may leak information.)
+
+    </itemize>
+
+  <!--}}}-->
+
+  <!--}}}-->
+
+  <sect>External applications <!--{{{--> 
+
+    <p>Mutt-ng in many places has to rely on external applications or
+    for convenience supports mechanisms involving external
+    applications.
+
+    <sect1>mailcap <!--{{{--> 
+
+      <p>One of these is the <tt/mailcap/ mechanism as defined by RfC
+      1524. Mutt-ng can be set up to <em/automatically/ execute any
+      given utility as listed in one of the mailcap files (see the
+      <ref id="mailcap_path" name="&dollar;mailcap&lowbar;path">
+      variable for details.) These utilities may have security issues
+      like overriding arbitrary files, contain exploitable bugs or just
+      leak information which is a bad in combination with running them
+      without prompting. When using mutt-ng's autoview mechanism
+      involing use of mailcap files, please make sure that
+
+      <itemize>
+
+        <item>you manually select trustworthy applications with a
+          reasonable calling sequence
+
+        <item>you check the contents of mailcap files from time to time
+          (for example after doing software installations/upgrades)
+
+        <item>you, if you're the system's operator, always keep the
+          software packages involved up-to-date
+
+        <item>you never ever change the default value of the
+          <ref id="mailcap_sanitize"
+          name="&dollar;mailcap&lowbar;sanitize"> variable
+
+      </itemize>
+
+    <!--}}}-->
+
+    <sect1>Other <!--{{{--> 
+
+      <p>Besides the mailcap mechanism, mutt-ng uses a number of other
+      external utilities for operation.
+
+      <p>The same security considerations apply for these as for tools
+      involved via mailcap (for example, mutt-ng is vulnerable to Denial
+      of Service Attacks with compressed folders support if the
+      uncompressed mailbox is too large for the disk it is saved to.)
+
+      <p>As already noted, most of these problems are not built in but
+      caused by wrong configuration, so please check your configuration.
+
+    <!--}}}-->
+
+  <!--}}}-->
+
+<!--}}}-->
+
 <chapt>Reference <!--{{{--> 
 
 <sect>Command line options<label id="commandline"> <!--{{{--> 
diff --git a/doc/manual.txt b/doc/manual.txt
index b162ee5..5a04f7a 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-r392
+                                     version devel-r408
 
                                           AAbbssttrraacctt
 
@@ -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 6.4.323  , page 162) variable.
+       can be customized with the _$_t_o___c_h_a_r_s (section 7.4.323  , page 165) variable.
 
              +
                    message is to you and you only
@@ -497,7 +497,7 @@
 
        _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 6.4.291  , page 152) by _t_h_r_e_a_d_s, there are
+       When the mailbox is _s_o_r_t_e_d (section 7.4.291  , page 155) 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 6.4.110  , page 108).  For example, you could use "%?M?(#%03M)&(%4l)?" in
-       _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 108) to optionally display the number of
+       tion 7.4.110  , page 111).  For example, you could use "%?M?(#%03M)&(%4l)?" in
+       _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111) 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 6.4.312  , page 160).
+       See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 7.4.312  , page 163).
 
        _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
 
@@ -531,8 +531,8 @@
 
        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 6.4.3  , page 83) variable for
-       future use. NNoottee:: Specifying an _$_a_l_i_a_s___f_i_l_e (section 6.4.3  , page 83) does not
+       the file specified by the _$_a_l_i_a_s___f_i_l_e (section 7.4.3  , page 86) variable for
+       future use. NNoottee:: Specifying an _$_a_l_i_a_s___f_i_l_e (section 7.4.3  , page 86) does not
        add the aliases specified there-in, you must also _s_o_u_r_c_e (section 3.28  , page
        42) the file.
 
@@ -605,7 +605,7 @@
        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 32) 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 6.4.88  , page 103) configuration variable is set.
+       _$_h_o_n_o_r___f_o_l_l_o_w_u_p___t_o (section 7.4.88  , page 106) 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 6.4.200  , page 131), _$_p_i_p_e___s_p_l_i_t
-       (section 6.4.202  , page 132), _$_p_i_p_e___s_e_p (section 6.4.201  , page 132) and
-       _$_w_a_i_t___k_e_y (section 6.4.335  , page 164) control the exact behavior of this
+       it.  The variables _$_p_i_p_e___d_e_c_o_d_e (section 7.4.200  , page 134), _$_p_i_p_e___s_p_l_i_t
+       (section 7.4.202  , page 135), _$_p_i_p_e___s_e_p (section 7.4.201  , page 135) and
+       _$_w_a_i_t___k_e_y (section 7.4.335  , page 167) 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 6.4.336  , page 165) variable.
+       the value of the _$_w_e_e_d (section 7.4.336  , page 168) 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
-       6.4.335  , page 164) can be used to control whether Mutt-ng will wait for a key
+       7.4.335  , page 167) 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 6.4.225  , page 137) variable to
+       The _p_a_g_e_r uses the _$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.225  , page 140) 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 6.4.308  , page 157) will change to a
+       folder. The %r in _$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160) 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 6.4.54  , page 95).
+       Also see _e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98).
 
        _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 6.4.192  , page 130) permanently.
+       _$_p_g_p___s_i_g_n___a_s (section 7.4.192  , page 133) 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 6.4.179  , page 127)) have obvious meanings.  But some explana-
+       _m_a_t (section 7.4.179  , page 130)) 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 6.4.139  ,
-       page 116)).  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.139  ,
+       page 119)).  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 6.4.214  , page 135) variable.  This means that you can
+       the _$_p_o_s_t_p_o_n_e_d (section 7.4.214  , page 138) 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 6.4.213  , page 134) quad-option.
+       See also the _$_p_o_s_t_p_o_n_e (section 7.4.213  , page 137) 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 6.1  , page 77) option is specified.  This
+       the ``-n'' _c_o_m_m_a_n_d _l_i_n_e (section 7.1  , page 79) 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 6.3  , page 79) to configure Mutt-ng.
+       your _c_o_m_m_a_n_d_s (section 7.3  , page 82) 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
 
-       An initialization file consists of a series of _c_o_m_m_a_n_d_s (section 6.3  , page
-       79).  Each line of the file may contain one or more commands.  When multiple
+       An initialization file consists of a series of _c_o_m_m_a_n_d_s (section 7.3  , page
+       82).  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-
@@ -1120,7 +1120,7 @@
             set record=+sent_on_$HOSTNAME
 
        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 6.3  , page 79).
+       complete list, see the _c_o_m_m_a_n_d _r_e_f_e_r_e_n_c_e (section 7.3  , page 82).
 
        _3_._3  _D_e_f_i_n_i_n_g_/_U_s_i_n_g _a_l_i_a_s_e_s
 
@@ -1146,7 +1146,7 @@
        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 6.4.3  , page 83)
+       only one file, the one pointed to by the _$_a_l_i_a_s___f_i_l_e (section 7.4.3  , page 86)
        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
@@ -1163,7 +1163,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 6.4.54  , page 95) variable set.
+       (section 7.4.54  , page 98) 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
@@ -1269,7 +1269,7 @@
        _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 6.5  , page 166).  The special
+       list of functions, see the _r_e_f_e_r_e_n_c_e (section 7.5  , page 169).  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
@@ -1299,8 +1299,8 @@
        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 6.4.297  , page
-       154) 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.297  , page
+       157) 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.
 
@@ -1336,7 +1336,7 @@
        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
-       6.5  , page 166).
+       7.5  , page 169).
 
        The advantage with using function names directly is that the macros will work
        regardless of the current key bindings, so they are not dependent on the user
@@ -1390,7 +1390,7 @@
 
           +o normal
 
-          +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225  , page 137) in the
+          +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.225  , page 140) in the
             body of a message)
 
           +o quoted1, quoted2, ..., quotedNN (higher levels of quoting)
@@ -1517,7 +1517,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 6.4.233  , page 139).)
+       _$_r_e_p_l_y___t_o (section 7.4.233  , page 142).)
 
        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
@@ -1618,7 +1618,7 @@
        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 6.4.66  , page 98)
+       lowup-To header is controlled by the _$_f_o_l_l_o_w_u_p___t_o (section 7.4.66  , page 101)
        configuration variable.
 
        More precisely, Mutt-ng maintains lists of patterns for the addresses of known
@@ -1688,8 +1688,8 @@
        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
        56) (such as ``='' and ``!''), any variable definition that affect these char-
-       acters (like _$_f_o_l_d_e_r (section 6.4.64  , page 97) and _$_s_p_o_o_l_f_i_l_e (section
-       6.4.297  , page 154)) should be executed before the mailboxes command.
+       acters (like _$_f_o_l_d_e_r (section 7.4.64  , page 100) and _$_s_p_o_o_l_f_i_l_e (section
+       7.4.297  , page 157)) 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
 
@@ -1716,7 +1716,7 @@
        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 6.4.54  , page 95) variable, or use the _e_d_i_t_-
+       set the _e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98) 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.
 
@@ -1766,10 +1766,10 @@
        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 6.4.230  , page 138).  Mutt-ng searches the initial list of message
+       (section 7.4.230  , page 141).  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
-       6.4.230  , page 138) mailbox.
+       7.4.230  , page 141) mailbox.
 
        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 53) for information on the
        exact format of _p_a_t_t_e_r_n.
@@ -1810,7 +1810,7 @@
        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 6.4.247  , page 142) variable depending on the message's
+       _$_s_e_n_d_m_a_i_l (section 7.4.247  , page 145) variable depending on the message's
        sender address.
 
        For each type of send-hook or reply-hook, when multiple matches occur, commands
@@ -1823,8 +1823,8 @@
        Example: send-hook mutt 'set mime_forward signature='''
 
        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 6.4.15  , page 86), _$_s_i_g_n_a_t_u_r_e (section 6.4.259  , page 145) and
-       _$_l_o_c_a_l_e (section 6.4.114  , page 111) variables in order to change the language
+       _t_i_o_n (section 7.4.15  , page 89), _$_s_i_g_n_a_t_u_r_e (section 7.4.259  , page 148) and
+       _$_l_o_c_a_l_e (section 7.4.114  , page 114) 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
@@ -1882,7 +1882,7 @@
        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 6.5  , page 166).  ``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 169).  ``exec function'' is equivalent
        to ``push <function>''.
 
        _3_._2_5  _M_e_s_s_a_g_e _S_c_o_r_i_n_g
@@ -1928,10 +1928,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 6.4.244  , page 142), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.245  , page 142),
-       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 6.4.243  , page 141) and.  By default,
-       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.245  , page 142) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
-       (section 6.4.243  , page 141) are set to -1, which means that in the default
+       tion 7.4.244  , page 145), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.245  , page 145),
+       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.243  , page 144) and.  By default,
+       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.245  , page 145) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
+       (section 7.4.243  , page 144) 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
@@ -1958,7 +1958,7 @@
 
        The Mutt Next Generation E-Mail Client                                       40
 
-       the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 108) variable.
+       the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111) variable.
        (Tip: try %?H?[%H] ?  to display spam tags only when they are defined for a
        given message.)
 
@@ -2049,8 +2049,8 @@
 
        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 6.4  ,
-       page 81).  There are four basic types of variables: boolean, number, string and
+       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 84).  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.
 
@@ -2196,13 +2196,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 6.4.99  , page 105),
+       test for the availability of _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.99  , page 108),
        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 6.4.169  , page 124) only if the pager menu is available, use:
+       (section 7.4.169  , page 127) only if the pager menu is available, use:
 
             ifdef pager 'set pager_index_lines = 10'
 
@@ -2225,14 +2225,14 @@
 
        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 6.4  , page 81) for a complete list.
+       _l_e_t_e _V_a_r_i_a_b_l_e_s (section 7.4  , page 84) 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 6.2  , page 78) must be specified using regular expressions (regexp) in
+       tion 7.2  , page 80) 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.
@@ -2416,7 +2416,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 6.2  , page 78) in the Reference chapter.
+       _t_e_r_n_s (section 7.2  , page 80) in the Reference chapter.
 
        It must be noted that in this table, EXPR, USER, ID and SUBJECT are regular
 
@@ -2505,7 +2505,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 6.4.308  , page 157) variable. For the hostname and version
+       _m_a_t (section 7.4.308  , page 160) 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:
 
@@ -2630,14 +2630,14 @@
        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
-       default.  See _p_a_t_t_e_r_n_s (section 6.2  , page 78) for Mutt-ng's pattern matching
+       default.  See _p_a_t_t_e_r_n_s (section 7.2  , page 80) 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 6.4.16  ,
-       page 87) 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.16  ,
+       page 90) 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 37) commands,
@@ -2652,7 +2652,7 @@
        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 44) or _p_a_t_t_e_r_n (section 6.2  , page 78) along
+       _e_x_p_r_e_s_s_i_o_n (section 4.1  , page 44) or _p_a_t_t_e_r_n (section 7.2  , page 80) along
        with a configuration option/command.  See
 
           +o _f_o_l_d_e_r_-_h_o_o_k (section 3.6  , page 26)
@@ -2689,7 +2689,7 @@
        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 6.2  , page 78) 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 80) 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
@@ -2706,8 +2706,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
-       6.4.45  , page 93) 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 6.4.45  , page 93) that is in
+       7.4.45  , page 96) 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.45  , page 96) 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
@@ -2765,7 +2765,7 @@
 
        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 6.4.221  , page 136) vari-
+       simple interface.  Using the _$_q_u_e_r_y___c_o_m_m_a_n_d (section 7.4.221  , page 139) vari-
        able, you specify the wrapper command to use.  For example:
 
             set query_command = "mutt_ldap_query.pl '%s'"
@@ -2804,7 +2804,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 6.4.125  , page 113)
+       uses the default specified with the _$_m_b_o_x___t_y_p_e (section 7.4.125  , page 116)
        variable.
 
        mmbbooxx.  This is the most widely used mailbox format for UNIX.  All messages are
@@ -2840,12 +2840,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 6.4.297  , page 154) (incoming)
+          +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 7.4.297  , page 157) (incoming)
             mailbox
 
-          +o > -- refers to your _$_m_b_o_x (section 6.4.124  , page 113) file
+          +o > -- refers to your _$_m_b_o_x (section 7.4.124  , page 116) file
 
-          +o < -- refers to your _$_r_e_c_o_r_d (section 6.4.230  , page 138) file
+          +o < -- refers to your _$_r_e_c_o_r_d (section 7.4.230  , page 141) file
 
           +o ^ -- refers to the current mailbox
 
@@ -2853,7 +2853,7 @@
 
           +o ~ -- refers to your home directory
 
-          +o = or + -- refers to your _$_f_o_l_d_e_r (section 6.4.64  , page 97) directory
+          +o = or + -- refers to your _$_f_o_l_d_e_r (section 7.4.64  , page 100) 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 35) as
             determined by the address of the alias
@@ -2874,7 +2874,7 @@
        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 6.4.110  , page 108) variable, the escape
+       box.  In the _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111) variable, the escape
        ``%L'' will return the string ``To <list>'' when ``list'' appears in the ``To''
        field, and ``Cc <list>'' when it appears in the ``Cc'' field (otherwise it
        returns the name of the author).
@@ -2889,7 +2889,7 @@
 
        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 6.4.66  , page 98) option is set, mutt will
+       and if the _$_f_o_l_l_o_w_u_p___t_o (section 7.4.66  , page 101) 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
@@ -2899,7 +2899,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 6.4.88  , page 103) configuration variable is set.  Using list-reply
+       (section 7.4.88  , page 106) 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.
 
@@ -2912,7 +2912,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
-       6.4.233  , page 139) variable to help decide which address to use.  If set to
+       7.4.233  , page 142) 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
@@ -2920,7 +2920,7 @@
 
        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 6.4.110  , page 108) variable's ``%y'' and ``%Y''
+       _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111) variable's ``%y'' and ``%Y''
 
        The Mutt Next Generation E-Mail Client                                       59
 
@@ -2929,7 +2929,7 @@
        ``~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 6.4.291  , page 152) the mail-
+       Lastly, Mutt-ng has the ability to _s_o_r_t (section 7.4.291  , page 155) 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-
@@ -2983,10 +2983,10 @@
 
        To support this, there are two variables:
 
-          +o _$_d_s_n___n_o_t_i_f_y (section 6.4.51  , page 94) is used to request receipts for
+          +o _$_d_s_n___n_o_t_i_f_y (section 7.4.51  , page 97) 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 6.4.52  , page 94) requests how much of your message
+          +o _$_d_s_n___r_e_t_u_r_n (section 7.4.52  , page 97) requests how much of your message
             should be returned with the receipt (headers or full message).
 
        Please see the reference chapter for possible values.
@@ -3008,7 +3008,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 6.4.208  , page 133) variable, which defaults
+       by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 7.4.208  , page 136) 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
@@ -3018,8 +3018,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 6.4.206  , page 133), fetch all your
-       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 6.4.297  , page 154).
+       It allows to connect to _p_o_p___h_o_s_t (section 7.4.206  , page 136), fetch all your
+       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 7.4.297  , page 157).
        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-
@@ -3061,12 +3061,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 6.4.97  , page 105) vari-
+       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.97  , page 108) vari-
        able.
 
        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 6.4.99  , page 105) and
-       _$_t_i_m_e_o_u_t (section 6.4.321  , page 161) variables.
+       want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.99  , page 108) and
+       _$_t_i_m_e_o_u_t (section 7.4.321  , page 164) 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
@@ -3116,15 +3116,15 @@
 
        There are a few variables which control authentication:
 
-          +o _$_i_m_a_p___u_s_e_r (section 6.4.105  , page 107) - controls the username under
+          +o _$_i_m_a_p___u_s_e_r (section 7.4.105  , page 110) - 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 6.4.100  , page 106) - a password which you may pre-
+          +o _$_i_m_a_p___p_a_s_s (section 7.4.100  , page 109) - 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 6.4.91  , page 103) - 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.91  , page 106) - 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).
@@ -3140,7 +3140,7 @@
        The Mutt Next Generation E-Mail Client                                       63
 
        variable. 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 6.4.156  , page 121) variable.
+       a file as specified by the _$_n_n_t_p___n_e_w_s_r_c (section 7.4.156  , page 124) 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,26 +3190,26 @@
        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 59) section) as well as handling the 8BIT-
-       MIME flag controlled via _$_u_s_e___8_b_i_t_m_i_m_e (section 6.4.328  , page 163).
+       MIME flag controlled via _$_u_s_e___8_b_i_t_m_i_m_e (section 7.4.328  , page 166).
 
        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 6.4.286  , page 151)
+       SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 7.4.286  , page 154)
        variable pointing to your SMTP server.
 
-       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 6.4.290  ,
-       page 152) and _$_s_m_t_p___p_a_s_s (section 6.4.287  , page 151) variables.
+       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 7.4.290  ,
+       page 155) and _$_s_m_t_p___p_a_s_s (section 7.4.287  , page 154) 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 6.4.289  , page 152) variable must be either set to
+       _$_s_m_t_p___u_s_e___t_l_s (section 7.4.289  , page 155) 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.
        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 6.4.285  ,
-       page 151) 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.285  ,
+       page 154) 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_)
 
@@ -3274,7 +3274,7 @@
        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 6.4.240  , page 141), so that the compressed file
+       unset _$_s_a_v_e___e_m_p_t_y (section 7.4.240  , page 144), 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
@@ -3350,7 +3350,7 @@
 
        When _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 66) 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 6.4.125  , page 113)) type is always
+       is. Thus the default (_$_m_b_o_x___t_y_p_e (section 7.4.125  , page 116)) type is always
        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  ,
@@ -3583,7 +3583,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 6.4.117  , page 112) variable.
+       them, see the _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 7.4.117  , page 115) 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.
@@ -3632,10 +3632,10 @@
              needsterminal
                    Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w (sec-
                    tion 5.4  , page 75), in order to decide whether it should honor
-                   the setting of the _$_w_a_i_t___k_e_y (section 6.4.335  , page 164) variable
+                   the setting of the _$_w_a_i_t___k_e_y (section 7.4.335  , page 167) 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 6.4.335  , page 164) and the exit
+                   ng will use _$_w_a_i_t___k_e_y (section 7.4.335  , page 167) 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.
@@ -3885,14 +3885,134 @@
        In addition, the unmime_lookup command may be used to disable this feature for
        any particular mime-type if it had been set, for example, in a global muttrc.
 
-       _6_.  _R_e_f_e_r_e_n_c_e
+       _6_.  _S_e_c_u_r_i_t_y _C_o_n_s_i_d_e_r_a_t_i_o_n_s
 
-       _6_._1  _C_o_m_m_a_n_d _l_i_n_e _o_p_t_i_o_n_s
+       First of all, mutt-ng contains no security holes included by intention but may
+       contain unknown security holes. As a consequence, please run mutt-ng only with
+       as few permissions as possible.
+
+       Please do not run mutt-ng as the super user.
+
+       When configuring mutt-ng, there're some points to note about secure setups.
+
+       In practice, mutt-ng can be easily made as vulnerable as even the most insecure
+       mail user agents (in their default configuration) just by changing mutt-ng's
+       configuration files: it then can execute arbitrary programs and scripts
+       attached to messages, send out private data on its own, etc. Although this is
+       not believed to the common type of setup, please read this chapter carefully.
+
+       _6_._1  _P_a_s_s_w_o_r_d_s
+
+       Although mutt-ng can be told the various passwords for accounts, please never
+       store passwords in configuration files. Besides the fact that the system's
+       operator can always read them, you could forget to replace the actual password
+       with asterisks when reporting a bug or asking for help via, for example, a
+       mailing list so that your mail including your password could be archived by
+       internet search engines, etc. Please never store passwords on disk.
+
+       _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.326  , page 166) 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.322  , page 165)
+       variable.
+
+       The Mutt Next Generation E-Mail Client                                       78
+
+       _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
+
+       In the default configuration, mutt-ng will leak some information to the outside
+       world when sending messages: the generation of Message-ID: headers includes a
+       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.142  , page 120) variable. Please make sure
+       that you really know how local parts of these Message-ID: headers are composed.
+
+       _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
+       in websites, there're security considerations, too. To keep the old behavior by
+       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.54  , page 98) 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
+
+            mailto:joe@host?Attach=~/.gnupg/secring.gpg
+
+       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.310  , page 162) 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.54  , page 98) variable by force to
+            let the user see all the headers (because they still may leak informa-
+            tion.)
+
+       _6_._4  _E_x_t_e_r_n_a_l _a_p_p_l_i_c_a_t_i_o_n_s
+
+       Mutt-ng in many places has to rely on external applications or for convenience
+       supports mechanisms involving external applications.
+
+       _6_._4_._1  _m_a_i_l_c_a_p
+
+       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.116  , page 114) variable for
+       details.) These utilities may have security issues like overriding arbitrary
+       files, contain exploitable bugs or just leak information which is a bad in com-
+       bination with running them without prompting. When using mutt-ng's autoview
+
+       The Mutt Next Generation E-Mail Client                                       79
+
+       mechanism involing use of mailcap files, please make sure that
+
+          +o you manually select trustworthy applications with a reasonable calling
+            sequence
+
+          +o you check the contents of mailcap files from time to time (for example
+            after doing software installations/upgrades)
+
+          +o you, if you're the system's operator, always keep the software packages
+            involved up-to-date
+
+          +o you never ever change the default value of the _$_m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section
+            7.4.117  , page 115) variable
+
+       _6_._4_._2  _O_t_h_e_r
+
+       Besides the mailcap mechanism, mutt-ng uses a number of other external utili-
+       ties for operation.
+
+       The same security considerations apply for these as for tools involved via
+       mailcap (for example, mutt-ng is vulnerable to Denial of Service Attacks with
+       compressed folders support if the uncompressed mailbox is too large for the
+       disk it is saved to.)
+
+       As already noted, most of these problems are not built in but caused by wrong
+       configuration, so please check your configuration.
+
+       _7_.  _R_e_f_e_r_e_n_c_e
+
+       _7_._1  _C_o_m_m_a_n_d _l_i_n_e _o_p_t_i_o_n_s
 
        Running mutt with no arguments will make Mutt-ng attempt to read your spool
        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                                       80
+
             -A   expand an alias
             -a      attach a file to a message
             -b      specify a blind carbon-copy (BCC) address
@@ -3918,8 +4038,6 @@
 
        To read messages in a mailbox
 
-       The Mutt Next Generation E-Mail Client                                       78
-
        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
@@ -3936,9 +4054,9 @@
        of ``data set for run #2''.  In the body of the message will be the contents of
        the file ``~/run2.dat''.
 
-       _6_._2  _P_a_t_t_e_r_n_s
+       _7_._2  _P_a_t_t_e_r_n_s
 
-       The Mutt Next Generation E-Mail Client                                       79
+       The Mutt Next Generation E-Mail Client                                       81
 
             ~A              all messages
             ~b EXPR         messages which contain EXPR in the message body
@@ -3993,11 +4111,11 @@
        intention to use a backslash in the regular expression, you will need to use
        two backslashes instead (\\).
 
-       The Mutt Next Generation E-Mail Client                                       80
+       The Mutt Next Generation E-Mail Client                                       82
 
        *) The forms <[MAX], >[MIN], [MIN]- and -[MAX] are allowed, too.
 
-       _6_._3  _C_o_n_f_i_g_u_r_a_t_i_o_n _C_o_m_m_a_n_d_s
+       _7_._3  _C_o_n_f_i_g_u_r_a_t_i_o_n _C_o_m_m_a_n_d_s
 
        The following are the commands understood by mutt.
 
@@ -4047,7 +4165,7 @@
 
           +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 ... ]
 
-       The Mutt Next Generation E-Mail Client                                       81
+       The Mutt Next Generation E-Mail Client                                       83
 
           +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 ... ]
 
@@ -4103,7 +4221,7 @@
 
           +o _n_o_s_p_a_m (section 3.26  , page 39) _p_a_t_t_e_r_n
 
-       The Mutt Next Generation E-Mail Client                                       82
+       The Mutt Next Generation E-Mail Client                                       84
 
           +o _s_u_b_s_c_r_i_b_e (section 3.12  , page 32) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
 
@@ -4113,14 +4231,14 @@
 
           +o _u_n_h_o_o_k (section 3.29  , page 42) _h_o_o_k_-_t_y_p_e
 
-       _6_._4  _C_o_n_f_i_g_u_r_a_t_i_o_n _v_a_r_i_a_b_l_e_s
+       _7_._4  _C_o_n_f_i_g_u_r_a_t_i_o_n _v_a_r_i_a_b_l_e_s
 
        The following list contains all variables which, in the process of providing
        more consistency, have been renamed and are partially even removed already. The
        left column contains the old synonym variables, the right column the full/new
        name:
 
-       The Mutt Next Generation E-Mail Client                                       83
+       The Mutt Next Generation E-Mail Client                                       85
 
             edit_hdrs               edit_headers
             forw_decode             forward_decode
@@ -4168,7 +4286,7 @@
 
        A complete list of current variables follows.
 
-       _6_._4_._1  _a_b_o_r_t___n_o_s_u_b_j_e_c_t
+       _7_._4_._1  _a_b_o_r_t___n_o_s_u_b_j_e_c_t
 
        Type: quadoption
 
@@ -4176,12 +4294,12 @@
 
        If set to _y_e_s, when composing messages and no subject is given at the subject
 
-       The Mutt Next Generation E-Mail Client                                       84
+       The Mutt Next Generation E-Mail Client                                       86
 
        prompt, composition will be aborted.  If set to _n_o, composing messages with no
        subject given at the subject prompt will never be aborted.
 
-       _6_._4_._2  _a_b_o_r_t___u_n_m_o_d_i_f_i_e_d
+       _7_._4_._2  _a_b_o_r_t___u_n_m_o_d_i_f_i_e_d
 
        Type: quadoption
 
@@ -4191,7 +4309,7 @@
        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.
 
-       _6_._4_._3  _a_l_i_a_s___f_i_l_e
+       _7_._4_._3  _a_l_i_a_s___f_i_l_e
 
        Type: path
 
@@ -4203,7 +4321,7 @@
        NNoottee:: Mutt-ng will not automatically source this file; you must explicitly use
        the ``_s_o_u_r_c_e (section 3.28  , page 42)'' command for it to be executed.
 
-       _6_._4_._4  _a_l_i_a_s___f_o_r_m_a_t
+       _7_._4_._4  _a_l_i_a_s___f_o_r_m_a_t
 
        Type: string
 
@@ -4227,18 +4345,18 @@
              %t
                    character which indicates if the alias is tagged for inclusion
 
-       _6_._4_._5  _a_l_l_o_w___8_b_i_t
+       _7_._4_._5  _a_l_l_o_w___8_b_i_t
 
        Type: boolean
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                       85
+       The Mutt Next Generation E-Mail Client                                       87
 
        Controls whether 8-bit data is converted to 7-bit using either quoted-printable
        or base64 encoding when sending mail.
 
-       _6_._4_._6  _a_l_l_o_w___a_n_s_i
+       _7_._4_._6  _a_l_l_o_w___a_n_s_i
 
        Type: boolean
 
@@ -4251,7 +4369,7 @@
        sage could include a line like ``[-- PGP output follows ...' and give it the
        same color as your attachment color.
 
-       _6_._4_._7  _a_r_r_o_w___c_u_r_s_o_r
+       _7_._4_._7  _a_r_r_o_w___c_u_r_s_o_r
 
        Type: boolean
 
@@ -4262,7 +4380,7 @@
        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.
 
-       _6_._4_._8  _a_s_c_i_i___c_h_a_r_s
+       _7_._4_._8  _a_s_c_i_i___c_h_a_r_s
 
        Type: boolean
 
@@ -4271,7 +4389,7 @@
        If _s_e_t, Mutt-ng will use plain ASCII characters when displaying thread and
        attachment trees, instead of the default ACS characters.
 
-       _6_._4_._9  _a_s_k_b_c_c
+       _7_._4_._9  _a_s_k_b_c_c
 
        Type: boolean
 
@@ -4280,7 +4398,7 @@
        If _s_e_t, Mutt-ng will prompt you for blind-carbon-copy (Bcc) recipients before
        editing an outgoing message.
 
-       _6_._4_._1_0  _a_s_k_c_c
+       _7_._4_._1_0  _a_s_k_c_c
 
        Type: boolean
 
@@ -4289,9 +4407,9 @@
        If _s_e_t, Mutt-ng will prompt you for carbon-copy (Cc) recipients before editing
        the body of an outgoing message.
 
-       The Mutt Next Generation E-Mail Client                                       86
+       The Mutt Next Generation E-Mail Client                                       88
 
-       _6_._4_._1_1  _a_s_s_u_m_e_d___c_h_a_r_s_e_t
+       _7_._4_._1_1  _a_s_s_u_m_e_d___c_h_a_r_s_e_t
 
        Type: string
 
@@ -4308,9 +4426,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 6.4.311  , page 159) is unset.
+       is valid only if _$_s_t_r_i_c_t___m_i_m_e (section 7.4.311  , page 162) is unset.
 
-       _6_._4_._1_2  _a_t_t_a_c_h___f_o_r_m_a_t
+       _7_._4_._1_2  _a_t_t_a_c_h___f_o_r_m_a_t
 
        Type: string
 
@@ -4346,7 +4464,7 @@
              %M
                    MIME subtype
 
-       The Mutt Next Generation E-Mail Client                                       87
+       The Mutt Next Generation E-Mail Client                                       89
 
              %n
                    attachment number
@@ -4369,7 +4487,7 @@
              %|X
                    pad to the end of the line with character 'X'
 
-       _6_._4_._1_3  _a_t_t_a_c_h___s_e_p
+       _7_._4_._1_3  _a_t_t_a_c_h___s_e_p
 
        Type: string
 
@@ -4378,7 +4496,7 @@
        The separator to add between attachments when operating (saving, printing, pip-
        ing, etc) on a list of tagged attachments.
 
-       _6_._4_._1_4  _a_t_t_a_c_h___s_p_l_i_t
+       _7_._4_._1_4  _a_t_t_a_c_h___s_p_l_i_t
 
        Type: boolean
 
@@ -4386,11 +4504,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 6.4.13  ,
-       page 86)'' 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.13  ,
+       page 89)'' separator is added after each attachment. When _s_e_t, Mutt-ng will
        operate on the attachments one by one.
 
-       _6_._4_._1_5  _a_t_t_r_i_b_u_t_i_o_n
+       _7_._4_._1_5  _a_t_t_r_i_b_u_t_i_o_n
 
        Type: string
 
@@ -4398,11 +4516,11 @@
 
        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 6.4.110  , page 108)''.
+       on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)''.
 
-       _6_._4_._1_6  _a_u_t_o___t_a_g
+       _7_._4_._1_6  _a_u_t_o___t_a_g
 
-       The Mutt Next Generation E-Mail Client                                       88
+       The Mutt Next Generation E-Mail Client                                       90
 
        Type: boolean
 
@@ -4413,20 +4531,20 @@
        ``tag-prefix'' function (default: ';') to make the next function apply to all
        tagged messages.
 
-       _6_._4_._1_7  _a_u_t_o_e_d_i_t
+       _7_._4_._1_7  _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 6.4.54  , page 95)'', Mutt-ng will
+       When _s_e_t along with ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98)'', 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 finished
        editing the body of your message.
 
-       Also see ``_$_f_a_s_t___r_e_p_l_y (section 6.4.60  , page 96)''.
+       Also see ``_$_f_a_s_t___r_e_p_l_y (section 7.4.60  , page 99)''.
 
-       _6_._4_._1_8  _b_e_e_p
+       _7_._4_._1_8  _b_e_e_p
 
        Type: boolean
 
@@ -4434,7 +4552,7 @@
 
        When this variable is _s_e_t, Mutt-ng will beep when an error occurs.
 
-       _6_._4_._1_9  _b_e_e_p___n_e_w
+       _7_._4_._1_9  _b_e_e_p___n_e_w
 
        Type: boolean
 
@@ -4442,9 +4560,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 6.4.18  , page 87)'' variable.
+       tion 7.4.18  , page 90)'' variable.
 
-       _6_._4_._2_0  _b_o_u_n_c_e
+       _7_._4_._2_0  _b_o_u_n_c_e
 
        Type: quadoption
 
@@ -4455,18 +4573,18 @@
        _n_o is not generally useful, and thus not recommended, because you are unable to
        bounce messages.
 
-       _6_._4_._2_1  _b_o_u_n_c_e___d_e_l_i_v_e_r_e_d
+       _7_._4_._2_1  _b_o_u_n_c_e___d_e_l_i_v_e_r_e_d
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                       89
+       The Mutt Next Generation E-Mail Client                                       91
 
        Default: yes
 
        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.
 
-       _6_._4_._2_2  _b_r_a_i_l_l_e___f_r_i_e_n_d_l_y
+       _7_._4_._2_2  _b_r_a_i_l_l_e___f_r_i_e_n_d_l_y
 
        Type: boolean
 
@@ -4478,7 +4596,7 @@
        option is disabled by default because many visual terminals don't permit making
        the cursor invisible.
 
-       _6_._4_._2_3  _c_e_r_t_i_f_i_c_a_t_e___f_i_l_e
+       _7_._4_._2_3  _c_e_r_t_i_f_i_c_a_t_e___f_i_l_e
 
        Type: path
 
@@ -4497,7 +4615,7 @@
 
        Example: set certificate_file=~/.muttng/certificates
 
-       _6_._4_._2_4  _c_h_a_r_s_e_t
+       _7_._4_._2_4  _c_h_a_r_s_e_t
 
        Type: string
 
@@ -4505,7 +4623,7 @@
 
        Character set your terminal uses to display and enter textual data.
 
-       _6_._4_._2_5  _c_h_e_c_k___n_e_w
+       _7_._4_._2_5  _c_h_e_c_k___n_e_w
 
        Type: boolean
 
@@ -4516,13 +4634,13 @@
        When _s_e_t, Mutt-ng will check for new mail delivered while the mailbox is open.
        Especially with MH mailboxes, this operation can take quite some time since it
 
-       The Mutt Next Generation E-Mail Client                                       90
+       The Mutt Next Generation E-Mail Client                                       92
 
        involves scanning the directory and checking each file to see if it has already
        been looked at.  If it's _u_n_s_e_t, no check for new mail is performed while the
        mailbox is open.
 
-       _6_._4_._2_6  _c_o_l_l_a_p_s_e___u_n_r_e_a_d
+       _7_._4_._2_6  _c_o_l_l_a_p_s_e___u_n_r_e_a_d
 
        Type: boolean
 
@@ -4531,14 +4649,14 @@
        When _u_n_s_e_t, Mutt-ng will not collapse a thread if it contains any unread mes-
        sages.
 
-       _6_._4_._2_7  _c_o_m_p_o_s_e___f_o_r_m_a_t
+       _7_._4_._2_7  _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 6.4.308  , page 157)'', but has
+       string is similar to ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160)'', but has
        its own set of printf(3)-like sequences:
 
              %a
@@ -4553,11 +4671,11 @@
              %v
                    Mutt-ng version string
 
-       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 6.4.308  , page 157)''
-       option for more information on how to set ``_$_c_o_m_p_o_s_e___f_o_r_m_a_t (section 6.4.27  ,
-       page 89)''.
+       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160)''
+       option for more information on how to set ``_$_c_o_m_p_o_s_e___f_o_r_m_a_t (section 7.4.27  ,
+       page 92)''.
 
-       _6_._4_._2_8  _c_o_n_f_i_g___c_h_a_r_s_e_t
+       _7_._4_._2_8  _c_o_n_f_i_g___c_h_a_r_s_e_t
 
        Type: string
 
@@ -4565,7 +4683,7 @@
 
        When defined, Mutt-ng will recode commands in rc files from this encoding.
 
-       _6_._4_._2_9  _c_o_n_f_i_r_m_a_p_p_e_n_d
+       _7_._4_._2_9  _c_o_n_f_i_r_m_a_p_p_e_n_d
 
        Type: boolean
 
@@ -4573,11 +4691,11 @@
 
        When _s_e_t, Mutt-ng will prompt for confirmation when appending messages to an
 
-       The Mutt Next Generation E-Mail Client                                       91
+       The Mutt Next Generation E-Mail Client                                       93
 
        existing mailbox.
 
-       _6_._4_._3_0  _c_o_n_f_i_r_m_c_r_e_a_t_e
+       _7_._4_._3_0  _c_o_n_f_i_r_m_c_r_e_a_t_e
 
        Type: boolean
 
@@ -4586,7 +4704,7 @@
        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.
 
-       _6_._4_._3_1  _c_o_n_n_e_c_t___t_i_m_e_o_u_t
+       _7_._4_._3_1  _c_o_n_n_e_c_t___t_i_m_e_o_u_t
 
        Type: number
 
@@ -4596,7 +4714,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.
 
-       _6_._4_._3_2  _c_o_n_t_e_n_t___t_y_p_e
+       _7_._4_._3_2  _c_o_n_t_e_n_t___t_y_p_e
 
        Type: string
 
@@ -4605,18 +4723,18 @@
        Sets the default Content-Type: header field for the body of newly composed mes-
        sages.
 
-       _6_._4_._3_3  _c_o_p_y
+       _7_._4_._3_3  _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 6.4.230  , page
-       138)'', ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 141)'', ``_$_f_o_r_c_e___n_a_m_e (section
-       6.4.68  , page 98)'' and ``_f_c_c_-_h_o_o_k (section 3.18  , page 35)''.
+       saved for later references.  Also see ``_$_r_e_c_o_r_d (section 7.4.230  , page
+       141)'', ``_$_s_a_v_e___n_a_m_e (section 7.4.241  , page 144)'', ``_$_f_o_r_c_e___n_a_m_e (section
+       7.4.68  , page 101)'' and ``_f_c_c_-_h_o_o_k (section 3.18  , page 35)''.
 
-       _6_._4_._3_4  _c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t
+       _7_._4_._3_4  _c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t
 
        Type: boolean
 
@@ -4626,13 +4744,13 @@
        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
-       6.4.277  , page 149)'' is _s_e_t, then OpenSSL is used instead to create S/MIME
+       7.4.277  , page 152)'' 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)
 
-       The Mutt Next Generation E-Mail Client                                       92
+       The Mutt Next Generation E-Mail Client                                       94
 
-       _6_._4_._3_5  _c_r_y_p_t___a_u_t_o_p_g_p
+       _7_._4_._3_5  _c_r_y_p_t___a_u_t_o_p_g_p
 
        Type: boolean
 
@@ -4640,11 +4758,11 @@
 
        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
-       6.4.34  , page 90)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38  , page 91)'',
-       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36  , page 91)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       6.4.39  , page 91)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277  , page 149)''.
+       7.4.34  , page 93)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.38  , page 94)'',
+       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.36  , page 94)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
+       7.4.39  , page 94)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.277  , page 152)''.
 
-       _6_._4_._3_6  _c_r_y_p_t___a_u_t_o_s_i_g_n
+       _7_._4_._3_6  _c_r_y_p_t___a_u_t_o_s_i_g_n
 
        Type: boolean
 
@@ -4653,11 +4771,11 @@
        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
        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 6.4.277  , page 149)'' is _s_e_t, then OpenSSL is
+       ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.277  , page 152)'' 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)
 
-       _6_._4_._3_7  _c_r_y_p_t___a_u_t_o_s_m_i_m_e
+       _7_._4_._3_7  _c_r_y_p_t___a_u_t_o_s_m_i_m_e
 
        Type: boolean
 
@@ -4665,11 +4783,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
-       6.4.34  , page 90)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38  , page 91)'',
-       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36  , page 91)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       6.4.39  , page 91)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277  , page 149)''.
+       7.4.34  , page 93)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.38  , page 94)'',
+       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.36  , page 94)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
+       7.4.39  , page 94)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.277  , page 152)''.
 
-       _6_._4_._3_8  _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t
+       _7_._4_._3_8  _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t
 
        Type: boolean
 
@@ -4678,7 +4796,7 @@
        If _s_e_t, automatically PGP or OpenSSL encrypt replies to messages which are
        encrypted.  (Crypto only)
 
-       _6_._4_._3_9  _c_r_y_p_t___r_e_p_l_y_s_i_g_n
+       _7_._4_._3_9  _c_r_y_p_t___r_e_p_l_y_s_i_g_n
 
        Type: boolean
 
@@ -4686,12 +4804,12 @@
 
        If _s_e_t, automatically PGP or OpenSSL sign replies to messages which are signed.
 
-       The Mutt Next Generation E-Mail Client                                       93
+       The Mutt Next Generation E-Mail Client                                       95
 
        NNoottee:: this does not work on messages that are encrypted aanndd signed!  (Crypto
        only)
 
-       _6_._4_._4_0  _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_0  _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
 
@@ -4699,12 +4817,12 @@
 
        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
-       6.4.38  , page 91)'', because it allows you to sign all messages which are
+       7.4.38  , page 94)'', because it allows you to sign all messages which are
        automatically encrypted.  This works around the problem noted in
-       ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section 6.4.39  , page 91)'', that Mutt-ng is not able to
+       ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section 7.4.39  , page 94)'', that Mutt-ng is not able to
        find out whether an encrypted message is also signed.  (Crypto only)
 
-       _6_._4_._4_1  _c_r_y_p_t___t_i_m_e_s_t_a_m_p
+       _7_._4_._4_1  _c_r_y_p_t___t_i_m_e_s_t_a_m_p
 
        Type: boolean
 
@@ -4715,7 +4833,7 @@
        ors to mark these lines, and rely on these, you may _u_n_s_e_t this setting.
        (Crypto only)
 
-       _6_._4_._4_2  _c_r_y_p_t___u_s_e___g_p_g_m_e
+       _7_._4_._4_2  _c_r_y_p_t___u_s_e___g_p_g_m_e
 
        Type: boolean
 
@@ -4728,7 +4846,7 @@
        NNoottee: You need to use this option in your .muttngrc configuration file as it
        won't have any effect when used interactively.
 
-       _6_._4_._4_3  _c_r_y_p_t___v_e_r_i_f_y___s_i_g
+       _7_._4_._4_3  _c_r_y_p_t___v_e_r_i_f_y___s_i_g
 
        Type: quadoption
 
@@ -4738,25 +4856,25 @@
        whether or not to verify the signature.  If ``_n_o'', never attempt to verify
        cryptographic signatures.  (Crypto only)
 
-       _6_._4_._4_4  _d_a_t_e___f_o_r_m_a_t
+       _7_._4_._4_4  _d_a_t_e___f_o_r_m_a_t
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                       94
+       The Mutt Next Generation E-Mail Client                                       96
 
        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 6.4.110  , page 108)''.  This is passed to strftime(3)
+       ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)''.  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 6.4.114  , page 111)''. If the first character in the string
+       ``_$_l_o_c_a_l_e (section 7.4.114  , page 114)''. 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).
 
-       _6_._4_._4_5  _d_e_f_a_u_l_t___h_o_o_k
+       _7_._4_._4_5  _d_e_f_a_u_l_t___h_o_o_k
 
        Type: string
 
@@ -4771,7 +4889,7 @@
        address matches ``alternates'') and is to or cc'ed to a user matching the given
        regular expression.
 
-       _6_._4_._4_6  _d_e_l_e_t_e
+       _7_._4_._4_6  _d_e_l_e_t_e
 
        Type: quadoption
 
@@ -4782,7 +4900,7 @@
        be purged without prompting.  If set to _n_o, messages marked for deletion will
        be kept in the mailbox.
 
-       _6_._4_._4_7  _d_e_l_e_t_e___u_n_t_a_g
+       _7_._4_._4_7  _d_e_l_e_t_e___u_n_t_a_g
 
        Type: boolean
 
@@ -4792,29 +4910,29 @@
        tion.  This applies when you either explicitly delete a message, or when you
        save it to another folder.
 
-       _6_._4_._4_8  _d_i_g_e_s_t___c_o_l_l_a_p_s_e
+       _7_._4_._4_8  _d_i_g_e_s_t___c_o_l_l_a_p_s_e
 
        Type: boolean
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                       95
+       The Mutt Next Generation E-Mail Client                                       97
 
        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.
 
-       _6_._4_._4_9  _d_i_s_p_l_a_y___f_i_l_t_e_r
+       _7_._4_._4_9  _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 6.4.49  ,
-       page 94), 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.49  ,
+       page 97), and the filtered message is read from the standard output.
 
-       _6_._4_._5_0  _d_o_t_l_o_c_k___p_r_o_g_r_a_m
+       _7_._4_._5_0  _d_o_t_l_o_c_k___p_r_o_g_r_a_m
 
        Type: path
 
@@ -4824,7 +4942,7 @@
 
        Contains the path of the muttng_dotlock(1) binary to be used by Mutt-ng.
 
-       _6_._4_._5_1  _d_s_n___n_o_t_i_f_y
+       _7_._4_._5_1  _d_s_n___n_o_t_i_f_y
 
        Type: string
 
@@ -4841,7 +4959,7 @@
 
        Example: set dsn_notify='failure,delay'
 
-       _6_._4_._5_2  _d_s_n___r_e_t_u_r_n
+       _7_._4_._5_2  _d_s_n___r_e_t_u_r_n
 
        Type: string
 
@@ -4854,11 +4972,11 @@
        It may be set to either _h_d_r_s to return just the message header, or _f_u_l_l to
        return the full message.
 
-       The Mutt Next Generation E-Mail Client                                       96
+       The Mutt Next Generation E-Mail Client                                       98
 
        Example: set dsn_return=hdrs
 
-       _6_._4_._5_3  _d_u_p_l_i_c_a_t_e___t_h_r_e_a_d_s
+       _7_._4_._5_3  _d_u_p_l_i_c_a_t_e___t_h_r_e_a_d_s
 
        Type: boolean
 
@@ -4869,7 +4987,7 @@
        indicate that it thinks they are duplicates of each other with an equals sign
        in the thread diagram.
 
-       _6_._4_._5_4  _e_d_i_t___h_e_a_d_e_r_s
+       _7_._4_._5_4  _e_d_i_t___h_e_a_d_e_r_s
 
        Type: boolean
 
@@ -4878,7 +4996,7 @@
        This option allows you to edit the header of your outgoing messages along with
        the body of your message.
 
-       _6_._4_._5_5  _e_d_i_t_o_r
+       _7_._4_._5_5  _e_d_i_t_o_r
 
        Type: path
 
@@ -4888,7 +5006,7 @@
        value of the $VISUAL, or $EDITOR, environment variable, or to the string 'vi'
        if neither of those are set.
 
-       _6_._4_._5_6  _e_n_c_o_d_e___f_r_o_m
+       _7_._4_._5_6  _e_n_c_o_d_e___f_r_o_m
 
        Type: boolean
 
@@ -4899,7 +5017,7 @@
        to avoid the tampering certain mail delivery and transport agents tend to do
        with messages.
 
-       _6_._4_._5_7  _e_n_t_r_o_p_y___f_i_l_e
+       _7_._4_._5_7  _e_n_t_r_o_p_y___f_i_l_e
 
        Type: path
 
@@ -4910,9 +5028,9 @@
        The file which includes random data that is used to initialize SSL library
        functions.
 
-       The Mutt Next Generation E-Mail Client                                       97
+       The Mutt Next Generation E-Mail Client                                       99
 
-       _6_._4_._5_8  _e_n_v_e_l_o_p_e___f_r_o_m
+       _7_._4_._5_8  _e_n_v_e_l_o_p_e___f_r_o_m
 
        Type: boolean
 
@@ -4921,10 +5039,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 6.4.247  , page 142) yourself, or
+       are using that switch in _$_s_e_n_d_m_a_i_l (section 7.4.247  , page 145) yourself, or
        if the sendmail on your machine doesn't support that command line switch.
 
-       _6_._4_._5_9  _e_s_c_a_p_e
+       _7_._4_._5_9  _e_s_c_a_p_e
 
        Type: string
 
@@ -4932,7 +5050,7 @@
 
        Escape character to use for functions in the builtin editor.
 
-       _6_._4_._6_0  _f_a_s_t___r_e_p_l_y
+       _7_._4_._6_0  _f_a_s_t___r_e_p_l_y
 
        Type: boolean
 
@@ -4942,10 +5060,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 6.4.17  , page
-       87)'' variable is _s_e_t.
+       NNoottee:: this variable has no effect when the ``_$_a_u_t_o_e_d_i_t (section 7.4.17  , page
+       90)'' variable is _s_e_t.
 
-       _6_._4_._6_1  _f_c_c___a_t_t_a_c_h
+       _7_._4_._6_1  _f_c_c___a_t_t_a_c_h
 
        Type: boolean
 
@@ -4954,7 +5072,7 @@
        This variable controls whether or not attachments on outgoing messages are
        saved along with the main body of your message.
 
-       _6_._4_._6_2  _f_c_c___c_l_e_a_r
+       _7_._4_._6_2  _f_c_c___c_l_e_a_r
 
        Type: boolean
 
@@ -4963,16 +5081,16 @@
        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)
 
-       _6_._4_._6_3  _f_i_l_e___c_h_a_r_s_e_t
+       _7_._4_._6_3  _f_i_l_e___c_h_a_r_s_e_t
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                       98
+       The Mutt Next Generation E-Mail Client                                      100
 
        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 6.4.24  , page 88) value will
+       file attatchments.  If _u_n_s_e_t, _$_c_h_a_r_s_e_t (section 7.4.24  , page 91) value will
        be used instead.  For example, the following configuration would work for
        Japanese text handling:
 
@@ -4981,7 +5099,7 @@
        Note: ``iso-2022-*'' must be put at the head of the value as shown above if
        included.
 
-       _6_._4_._6_4  _f_o_l_d_e_r
+       _7_._4_._6_4  _f_o_l_d_e_r
 
        Type: path
 
@@ -4993,15 +5111,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.
 
-       _6_._4_._6_5  _f_o_l_d_e_r___f_o_r_m_a_t
+       _7_._4_._6_5  _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 6.4.110  , page
-       108)'', 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.110  , page
+       111)'', but has its own set of printf(3)-like sequences:
 
              %C
                    current file number
@@ -5024,7 +5142,7 @@
              %N
                    N if folder has new mail, blank otherwise
 
-       The Mutt Next Generation E-Mail Client                                       99
+       The Mutt Next Generation E-Mail Client                                      101
 
              %s
                    size in bytes
@@ -5041,7 +5159,7 @@
              %|X
                    pad to the end of the line with character 'X'
 
-       _6_._4_._6_6  _f_o_l_l_o_w_u_p___t_o
+       _7_._4_._6_6  _f_o_l_l_o_w_u_p___t_o
 
        Type: boolean
 
@@ -5061,7 +5179,7 @@
        a subscribed list will be sent to both the list and your address, resulting in
        two copies of the same email for you.
 
-       _6_._4_._6_7  _f_o_r_c_e___b_u_f_f_y___c_h_e_c_k
+       _7_._4_._6_7  _f_o_r_c_e___b_u_f_f_y___c_h_e_c_k
 
        Type: boolean
 
@@ -5071,25 +5189,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 6.4.321  , page 161)'',
-       ``_$_m_a_i_l___c_h_e_c_k (section 6.4.115  , page 111)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
-       6.4.99  , page 105)''.
+       Also see the following variables: ``_$_t_i_m_e_o_u_t (section 7.4.321  , page 164)'',
+       ``_$_m_a_i_l___c_h_e_c_k (section 7.4.115  , page 114)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
+       7.4.99  , page 108)''.
 
-       _6_._4_._6_8  _f_o_r_c_e___n_a_m_e
+       _7_._4_._6_8  _f_o_r_c_e___n_a_m_e
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      100
+       The Mutt Next Generation E-Mail Client                                      102
 
-       This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 141)'',
+       This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 7.4.241  , page 144)'',
        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 6.4.230  , page 138)'' variable.
+       Also see the ``_$_r_e_c_o_r_d (section 7.4.230  , page 141)'' variable.
 
-       _6_._4_._6_9  _f_o_r_w_a_r_d___d_e_c_o_d_e
+       _7_._4_._6_9  _f_o_r_w_a_r_d___d_e_c_o_d_e
 
        Type: boolean
 
@@ -5097,10 +5215,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 6.4.136  , page 115)'' 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 6.4.137  , page 115)'' is used instead.
+       used, if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.136  , page 118)'' 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.137  , page 118)'' is used instead.
 
-       _6_._4_._7_0  _f_o_r_w_a_r_d___d_e_c_r_y_p_t
+       _7_._4_._7_0  _f_o_r_w_a_r_d___d_e_c_r_y_p_t
 
        Type: boolean
 
@@ -5108,10 +5226,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 6.4.136  , page 115)'' is _s_e_t and ``_$_m_i_m_e___f_o_r_-
-       _w_a_r_d___d_e_c_o_d_e (section 6.4.137  , page 115)'' is _u_n_s_e_t.  (PGP only)
+       if ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.136  , page 118)'' 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.137  , page 118)'' is _u_n_s_e_t.  (PGP only)
 
-       _6_._4_._7_1  _f_o_r_w_a_r_d___e_d_i_t
+       _7_._4_._7_1  _f_o_r_w_a_r_d___e_d_i_t
 
        Type: quadoption
 
@@ -5121,38 +5239,38 @@
        editor when forwarding messages.  For those who always want to forward with no
        modification, use a setting of _n_o.
 
-       _6_._4_._7_2  _f_o_r_w_a_r_d___f_o_r_m_a_t
+       _7_._4_._7_2  _f_o_r_w_a_r_d___f_o_r_m_a_t
 
        Type: string
 
        Default: '[%a: %s]'
 
        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 6.4.110  , page
-       108)'' variable.
+       the same format sequences as the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page
+       111)'' variable.
 
-       _6_._4_._7_3  _f_o_r_w_a_r_d___q_u_o_t_e
+       _7_._4_._7_3  _f_o_r_w_a_r_d___q_u_o_t_e
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      101
+       The Mutt Next Generation E-Mail Client                                      103
 
        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 6.4.136  , page 115)'' is _u_n_s_e_t) will be quoted using
-       ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109  , page 108)''.
+       ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.136  , page 118)'' 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.109  , page 111)''.
 
-       _6_._4_._7_4  _f_r_o_m
+       _7_._4_._7_4  _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 6.4.236  , page
-       140)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 6.4.330  , page
-       163)'' is unset.
+       my_hdr (including from send-hooks) and ``_$_r_e_v_e_r_s_e___n_a_m_e (section 7.4.236  , page
+       143)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 7.4.330  , page
+       166)'' 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
@@ -5160,7 +5278,7 @@
 
        Defaults to the contents of the environment variable $EMAIL.
 
-       _6_._4_._7_5  _g_e_c_o_s___m_a_s_k
+       _7_._4_._7_5  _g_e_c_o_s___m_a_s_k
 
        Type: regular expression
 
@@ -5178,7 +5296,7 @@
        expression that will match the whole name so Mutt-ng will expand ``Franklin''
        to ``Franklin, Steve''.
 
-       _6_._4_._7_6  _h_d_r_s
+       _7_._4_._7_6  _h_d_r_s
 
        Type: boolean
 
@@ -5189,19 +5307,19 @@
        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.
 
-       _6_._4_._7_7  _h_e_a_d_e_r
+       _7_._4_._7_7  _h_e_a_d_e_r
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      102
+       The Mutt Next Generation E-Mail Client                                      104
 
        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 6.4.336  , page
-       165)'' setting applies.
+       are replying to into the edit buffer.  The ``_$_w_e_e_d (section 7.4.336  , page
+       168)'' setting applies.
 
-       _6_._4_._7_8  _h_e_a_d_e_r___c_a_c_h_e
+       _7_._4_._7_8  _h_e_a_d_e_r___c_a_c_h_e
 
        Type: path
 
@@ -5209,15 +5327,15 @@
 
        Availability: Header Cache
 
-       The _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  , page 101) variable points to the header
+       The _$_h_e_a_d_e_r___c_a_c_h_e (section 7.4.78  , page 104) variable points to the header
        cache database.
 
-       If _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  , page 101) points to a directory it will
+       If _$_h_e_a_d_e_r___c_a_c_h_e (section 7.4.78  , page 104) 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
-       6.4.78  , page 101) points to a file that file will be a single global header
+       7.4.78  , page 104) 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.
 
-       _6_._4_._7_9  _h_e_a_d_e_r___c_a_c_h_e___c_o_m_p_r_e_s_s
+       _7_._4_._7_9  _h_e_a_d_e_r___c_a_c_h_e___c_o_m_p_r_e_s_s
 
        Type: boolean
 
@@ -5227,7 +5345,7 @@
        diskspace is used, but the uncompression can result in a slower open of the
        cached folder.
 
-       _6_._4_._8_0  _h_e_l_p
+       _7_._4_._8_0  _h_e_l_p
 
        Type: boolean
 
@@ -5242,7 +5360,7 @@
        is primarily aimed at new users, neither of these should present a major prob-
        lem.
 
-       _6_._4_._8_1  _h_i_d_d_e_n___h_o_s_t
+       _7_._4_._8_1  _h_i_d_d_e_n___h_o_s_t
 
        Type: boolean
 
@@ -5250,13 +5368,13 @@
 
        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                                      103
+       The Mutt Next Generation E-Mail Client                                      105
 
-       6.4.89  , page 103)'' variable when adding the domain part to addresses.  This
+       7.4.89  , page 106)'' 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.
 
-       _6_._4_._8_2  _h_i_d_e___l_i_m_i_t_e_d
+       _7_._4_._8_2  _h_i_d_e___l_i_m_i_t_e_d
 
        Type: boolean
 
@@ -5265,7 +5383,7 @@
        When _s_e_t, Mutt-ng will not show the presence of messages that are hidden by
        limiting, in the thread tree.
 
-       _6_._4_._8_3  _h_i_d_e___m_i_s_s_i_n_g
+       _7_._4_._8_3  _h_i_d_e___m_i_s_s_i_n_g
 
        Type: boolean
 
@@ -5274,7 +5392,7 @@
        When _s_e_t, Mutt-ng will not show the presence of missing messages in the thread
        tree.
 
-       _6_._4_._8_4  _h_i_d_e___t_h_r_e_a_d___s_u_b_j_e_c_t
+       _7_._4_._8_4  _h_i_d_e___t_h_r_e_a_d___s_u_b_j_e_c_t
 
        Type: boolean
 
@@ -5283,7 +5401,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.
 
-       _6_._4_._8_5  _h_i_d_e___t_o_p___l_i_m_i_t_e_d
+       _7_._4_._8_5  _h_i_d_e___t_o_p___l_i_m_i_t_e_d
 
        Type: boolean
 
@@ -5291,30 +5409,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 6.4.83  , page 102) is set, this option will have no effect.
+       _i_n_g (section 7.4.83  , page 105) is set, this option will have no effect.
 
-       _6_._4_._8_6  _h_i_d_e___t_o_p___m_i_s_s_i_n_g
+       _7_._4_._8_6  _h_i_d_e___t_o_p___m_i_s_s_i_n_g
 
        Type: boolean
 
        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 6.4.82  ,
-       page 102) 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.82  ,
+       page 105) is _s_e_t, this option will have no effect.
 
-       _6_._4_._8_7  _h_i_s_t_o_r_y
+       _7_._4_._8_7  _h_i_s_t_o_r_y
 
        Type: number
 
-       The Mutt Next Generation E-Mail Client                                      104
+       The Mutt Next Generation E-Mail Client                                      106
 
        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.
 
-       _6_._4_._8_8  _h_o_n_o_r___f_o_l_l_o_w_u_p___t_o
+       _7_._4_._8_8  _h_o_n_o_r___f_o_l_l_o_w_u_p___t_o
 
        Type: quadoption
 
@@ -5323,7 +5441,7 @@
        This variable controls whether or not a Mail-Followup-To: header field is hon-
        ored when group-replying to a message.
 
-       _6_._4_._8_9  _h_o_s_t_n_a_m_e
+       _7_._4_._8_9  _h_o_s_t_n_a_m_e
 
        Type: string
 
@@ -5335,7 +5453,7 @@
        Please be sure to really know what you are doing when changing this variable to
        configure a custom domain part of Message-IDs.
 
-       _6_._4_._9_0  _i_g_n_o_r_e___l_i_s_t___r_e_p_l_y___t_o
+       _7_._4_._9_0  _i_g_n_o_r_e___l_i_s_t___r_e_p_l_y___t_o
 
        Type: boolean
 
@@ -5349,7 +5467,7 @@
        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.
 
-       _6_._4_._9_1  _i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
+       _7_._4_._9_1  _i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
 
        Type: string
 
@@ -5363,7 +5481,7 @@
        capability string, e.g. ``digest-md5'', ``gssapi'' or ``cram-md5''. This param-
        eter is case-insensitive.
 
-       The Mutt Next Generation E-Mail Client                                      105
+       The Mutt Next Generation E-Mail Client                                      107
 
        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.
@@ -5374,7 +5492,7 @@
        ous methods are unavailable. If a method is available but authentication fails,
        Mutt-ng will not connect to the IMAP server.
 
-       _6_._4_._9_2  _i_m_a_p___c_h_e_c_k___s_u_b_s_c_r_i_b_e_d
+       _7_._4_._9_2  _i_m_a_p___c_h_e_c_k___s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
@@ -5384,7 +5502,7 @@
        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 33)'' command.
 
-       _6_._4_._9_3  _i_m_a_p___d_e_l_i_m___c_h_a_r_s
+       _7_._4_._9_3  _i_m_a_p___d_e_l_i_m___c_h_a_r_s
 
        Type: string
 
@@ -5394,9 +5512,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 6.4.64  , page 97) variable.
+       shortcut for your _$_f_o_l_d_e_r (section 7.4.64  , page 100) variable.
 
-       _6_._4_._9_4  _i_m_a_p___h_e_a_d_e_r_s
+       _7_._4_._9_4  _i_m_a_p___h_e_a_d_e_r_s
 
        Type: string
 
@@ -5411,7 +5529,7 @@
 
        NNoottee:: This is a space separated list.
 
-       _6_._4_._9_5  _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e
+       _7_._4_._9_5  _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e
 
        Type: string
 
@@ -5419,13 +5537,13 @@
 
        Availability: IMAP
 
-       The Mutt Next Generation E-Mail Client                                      106
+       The Mutt Next Generation E-Mail Client                                      108
 
        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.
 
-       _6_._4_._9_6  _i_m_a_p___k_e_e_p_a_l_i_v_e
+       _7_._4_._9_6  _i_m_a_p___k_e_e_p_a_l_i_v_e
 
        Type: number
 
@@ -5444,7 +5562,7 @@
        Reduce this number if you find yourself getting disconnected from your IMAP
        server due to inactivity.
 
-       _6_._4_._9_7  _i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d
+       _7_._4_._9_7  _i_m_a_p___l_i_s_t___s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
@@ -5456,7 +5574,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.
 
-       _6_._4_._9_8  _i_m_a_p___l_o_g_i_n
+       _7_._4_._9_8  _i_m_a_p___l_o_g_i_n
 
        Type: string
 
@@ -5466,23 +5584,23 @@
 
        Your login name on the IMAP server.
 
-       This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 6.4.105  , page
-       107).''
+       This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 7.4.105  , page
+       110).''
 
-       _6_._4_._9_9  _i_m_a_p___m_a_i_l___c_h_e_c_k
+       _7_._4_._9_9  _i_m_a_p___m_a_i_l___c_h_e_c_k
 
        Type: number
 
        Default: 300
 
-       The Mutt Next Generation E-Mail Client                                      107
+       The Mutt Next Generation E-Mail Client                                      109
 
        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 6.4.115  ,
-       page 111)'' 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.115  ,
+       page 114)'' variable to generate less traffic and get more accurate information
        for local folders.
 
-       _6_._4_._1_0_0  _i_m_a_p___p_a_s_s
+       _7_._4_._1_0_0  _i_m_a_p___p_a_s_s
 
        Type: string
 
@@ -5497,7 +5615,7 @@
        machine, because the superuser can read your configuration even if you are the
        only one who can read the file.
 
-       _6_._4_._1_0_1  _i_m_a_p___p_a_s_s_i_v_e
+       _7_._4_._1_0_1  _i_m_a_p___p_a_s_s_i_v_e
 
        Type: boolean
 
@@ -5510,7 +5628,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.
 
-       _6_._4_._1_0_2  _i_m_a_p___p_e_e_k
+       _7_._4_._1_0_2  _i_m_a_p___p_e_e_k
 
        Type: boolean
 
@@ -5523,7 +5641,7 @@
        closing an IMAP folder somewhat slower. This option exists to appease speed
        freaks.
 
-       _6_._4_._1_0_3  _i_m_a_p___r_e_c_o_n_n_e_c_t
+       _7_._4_._1_0_3  _i_m_a_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
 
@@ -5531,12 +5649,12 @@
 
        Availability: IMAP
 
-       The Mutt Next Generation E-Mail Client                                      108
+       The Mutt Next Generation E-Mail Client                                      110
 
        Controls whether or not Mutt-ng will try to reconnect to IMAP server when the
        connection is lost.
 
-       _6_._4_._1_0_4  _i_m_a_p___s_e_r_v_e_r_n_o_i_s_e
+       _7_._4_._1_0_4  _i_m_a_p___s_e_r_v_e_r_n_o_i_s_e
 
        Type: boolean
 
@@ -5549,7 +5667,7 @@
        ration problems on the server which are out of the users' hands, you may wish
        to suppress them at some point.
 
-       _6_._4_._1_0_5  _i_m_a_p___u_s_e_r
+       _7_._4_._1_0_5  _i_m_a_p___u_s_e_r
 
        Type: string
 
@@ -5561,7 +5679,7 @@
 
        This variable defaults to your user name on the local machine.
 
-       _6_._4_._1_0_6  _i_m_p_l_i_c_i_t___a_u_t_o_v_i_e_w
+       _7_._4_._1_0_6  _i_m_p_l_i_c_i_t___a_u_t_o_v_i_e_w
 
        Type: boolean
 
@@ -5572,7 +5690,7 @@
        If such an entry is found, Mutt-ng will use the viewer defined in that entry to
        convert the body part to text form.
 
-       _6_._4_._1_0_7  _i_n_c_l_u_d_e
+       _7_._4_._1_0_7  _i_n_c_l_u_d_e
 
        Type: quadoption
 
@@ -5581,18 +5699,18 @@
        Controls whether or not a copy of the message(s) you are replying to is
        included in your reply.
 
-       _6_._4_._1_0_8  _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t
+       _7_._4_._1_0_8  _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                                      109
+       The Mutt Next Generation E-Mail Client                                      111
 
        Controls whether or not Mutt-ng includes only the first attachment of the mes-
        sage you are replying.
 
-       _6_._4_._1_0_9  _i_n_d_e_n_t___s_t_r_i_n_g
+       _7_._4_._1_0_9  _i_n_d_e_n_t___s_t_r_i_n_g
 
        Type: string
 
@@ -5602,7 +5720,7 @@
        which you are replying.  You are strongly encouraged not to change this value,
        as it tends to agitate the more fanatical netizens.
 
-       _6_._4_._1_1_0  _i_n_d_e_x___f_o_r_m_a_t
+       _7_._4_._1_1_0  _i_n_d_e_x___f_o_r_m_a_t
 
        Type: string
 
@@ -5642,7 +5760,7 @@
                    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                                      110
+       The Mutt Next Generation E-Mail Client                                      112
 
              %e
                    current message number in thread
@@ -5699,11 +5817,11 @@
              %t
                    `to:' field (recipients)
 
-       The Mutt Next Generation E-Mail Client                                      111
+       The Mutt Next Generation E-Mail Client                                      113
 
              %T
-                   the appropriate character from the _$_t_o___c_h_a_r_s (section 6.4.323  ,
-                   page 162) string
+                   the appropriate character from the _$_t_o___c_h_a_r_s (section 7.4.323  ,
+                   page 165) string
 
              %u
                    user (login) name of the author
@@ -5751,11 +5869,11 @@
              %|X
                    pad to the end of the line with character 'X'
 
-       See also: ``_$_t_o___c_h_a_r_s (section 6.4.323  , page 162)''.
+       See also: ``_$_t_o___c_h_a_r_s (section 7.4.323  , page 165)''.
 
-       _6_._4_._1_1_1  _i_s_p_e_l_l
+       _7_._4_._1_1_1  _i_s_p_e_l_l
 
-       The Mutt Next Generation E-Mail Client                                      112
+       The Mutt Next Generation E-Mail Client                                      114
 
        Type: path
 
@@ -5763,17 +5881,17 @@
 
        How to invoke ispell (GNU's spell-checking software).
 
-       _6_._4_._1_1_2  _k_e_e_p___f_l_a_g_g_e_d
+       _7_._4_._1_1_2  _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 6.4.124  , page 113)'' mailbox, or as a result of
+       box to your ``_$_m_b_o_x (section 7.4.124  , page 116)'' mailbox, or as a result of
        a ``_m_b_o_x_-_h_o_o_k (section 3.13  , page 33)'' command.
 
-       _6_._4_._1_1_3  _l_i_s_t___r_e_p_l_y
+       _7_._4_._1_1_3  _l_i_s_t___r_e_p_l_y
 
        Type: quadoption
 
@@ -5783,7 +5901,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.
 
-       _6_._4_._1_1_4  _l_o_c_a_l_e
+       _7_._4_._1_1_4  _l_o_c_a_l_e
 
        Type: string
 
@@ -5792,7 +5910,7 @@
        The locale used by strftime(3) to format dates. Legal values are the strings
        your system accepts for the locale variable LC_TIME.
 
-       _6_._4_._1_1_5  _m_a_i_l___c_h_e_c_k
+       _7_._4_._1_1_5  _m_a_i_l___c_h_e_c_k
 
        Type: number
 
@@ -5802,9 +5920,9 @@
        mail.
 
        NNoottee:: This does not apply to IMAP mailboxes, see _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
-       6.4.99  , page 105).
+       7.4.99  , page 108).
 
-       _6_._4_._1_1_6  _m_a_i_l_c_a_p___p_a_t_h
+       _7_._4_._1_1_6  _m_a_i_l_c_a_p___p_a_t_h
 
        Type: string
 
@@ -5812,11 +5930,11 @@
 
        This variable specifies which files to consult when attempting to display MIME
 
-       The Mutt Next Generation E-Mail Client                                      113
+       The Mutt Next Generation E-Mail Client                                      115
 
        bodies not directly supported by Mutt-ng.
 
-       _6_._4_._1_1_7  _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e
+       _7_._4_._1_1_7  _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e
 
        Type: boolean
 
@@ -5828,7 +5946,7 @@
 
        DDOONN''TT CCHHAANNGGEE TTHHIISS SSEETTTTIINNGG UUNNLLEESSSS YYOOUU AARREE RREEAALLLLYY SSUURREE WWHHAATT YYOOUU AARREE DDOOIINNGG!!
 
-       _6_._4_._1_1_8  _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_1_8  _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
 
@@ -5840,7 +5958,7 @@
        files when the header cache is in use. This incurs one stat(2) per message
        every time the folder is opened.
 
-       _6_._4_._1_1_9  _m_a_i_l_d_i_r___t_r_a_s_h
+       _7_._4_._1_1_9  _m_a_i_l_d_i_r___t_r_a_s_h
 
        Type: boolean
 
@@ -5854,7 +5972,7 @@
 
        It is similiar to the trash option.
 
-       _6_._4_._1_2_0  _m_a_r_k___o_l_d
+       _7_._4_._1_2_0  _m_a_r_k___o_l_d
 
        Type: boolean
 
@@ -5867,9 +5985,9 @@
        up with an 'O' next to them in the ``index'' menu, indicating that they are
        old.
 
-       The Mutt Next Generation E-Mail Client                                      114
+       The Mutt Next Generation E-Mail Client                                      116
 
-       _6_._4_._1_2_1  _m_a_r_k_e_r_s
+       _7_._4_._1_2_1  _m_a_r_k_e_r_s
 
        Type: boolean
 
@@ -5877,9 +5995,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 6.4.263  , page 146)'' variable.
+       ``_$_s_m_a_r_t___w_r_a_p (section 7.4.263  , page 149)'' variable.
 
-       _6_._4_._1_2_2  _m_a_s_k
+       _7_._4_._1_2_2  _m_a_s_k
 
        Type: regular expression
 
@@ -5889,7 +6007,7 @@
        operator ``!''.  Only files whose names match this mask will be shown. The
        match is always case-sensitive.
 
-       _6_._4_._1_2_3  _m_a_x___l_i_n_e___l_e_n_g_t_h
+       _7_._4_._1_2_3  _m_a_x___l_i_n_e___l_e_n_g_t_h
 
        Type: number
 
@@ -5898,18 +6016,18 @@
        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 6.4.338  , page 165).
+       (section 7.4.338  , page 168).
 
-       _6_._4_._1_2_4  _m_b_o_x
+       _7_._4_._1_2_4  _m_b_o_x
 
        Type: path
 
        Default: '~/mbox'
 
        This specifies the folder into which read mail in your ``_$_s_p_o_o_l_f_i_l_e (section
-       6.4.297  , page 154)'' folder will be appended.
+       7.4.297  , page 157)'' folder will be appended.
 
-       _6_._4_._1_2_5  _m_b_o_x___t_y_p_e
+       _7_._4_._1_2_5  _m_b_o_x___t_y_p_e
 
        Type: folder magic
 
@@ -5918,19 +6036,19 @@
        The default mailbox type used when creating new folders. May be any of mbox,
        MMDF, MH and Maildir.
 
-       _6_._4_._1_2_6  _m_e_n_u___c_o_n_t_e_x_t
+       _7_._4_._1_2_6  _m_e_n_u___c_o_n_t_e_x_t
 
        Type: number
 
        Default: 0
 
-       The Mutt Next Generation E-Mail Client                                      115
+       The Mutt Next Generation E-Mail Client                                      117
 
        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 6.4.167  , page
-       124)''.)
+       scrolling through menus. (Similar to ``_$_p_a_g_e_r___c_o_n_t_e_x_t (section 7.4.167  , page
+       127)''.)
 
-       _6_._4_._1_2_7  _m_e_n_u___m_o_v_e___o_f_f
+       _7_._4_._1_2_7  _m_e_n_u___m_o_v_e___o_f_f
 
        Type: boolean
 
@@ -5940,7 +6058,7 @@
        the screen, unless there are less entries than lines.  When _s_e_t, the bottom
        entry may move off the bottom.
 
-       _6_._4_._1_2_8  _m_e_n_u___s_c_r_o_l_l
+       _7_._4_._1_2_8  _m_e_n_u___s_c_r_o_l_l
 
        Type: boolean
 
@@ -5951,7 +6069,7 @@
        vious page of the menu is displayed (useful for slow links to avoid many
        redraws).
 
-       _6_._4_._1_2_9  _m_e_s_s_a_g_e___f_o_r_m_a_t
+       _7_._4_._1_2_9  _m_e_s_s_a_g_e___f_o_r_m_a_t
 
        Type: string
 
@@ -5959,9 +6077,9 @@
 
        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 6.4.110  , page 108)''.
+       section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)''.
 
-       _6_._4_._1_3_0  _m_e_t_a___k_e_y
+       _7_._4_._1_3_0  _m_e_t_a___k_e_y
 
        Type: boolean
 
@@ -5974,18 +6092,18 @@
        because the result of removing the high bit from ``0xf4'' is ``0x74'', which is
        the ASCII character ``x''.
 
-       _6_._4_._1_3_1  _m_e_t_o_o
+       _7_._4_._1_3_1  _m_e_t_o_o
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      116
+       The Mutt Next Generation E-Mail Client                                      118
 
        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.
 
-       _6_._4_._1_3_2  _m_h___p_u_r_g_e
+       _7_._4_._1_3_2  _m_h___p_u_r_g_e
 
        Type: boolean
 
@@ -5995,7 +6113,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.
 
-       _6_._4_._1_3_3  _m_h___s_e_q___f_l_a_g_g_e_d
+       _7_._4_._1_3_3  _m_h___s_e_q___f_l_a_g_g_e_d
 
        Type: string
 
@@ -6003,7 +6121,7 @@
 
        The name of the MH sequence used for flagged messages.
 
-       _6_._4_._1_3_4  _m_h___s_e_q___r_e_p_l_i_e_d
+       _7_._4_._1_3_4  _m_h___s_e_q___r_e_p_l_i_e_d
 
        Type: string
 
@@ -6011,7 +6129,7 @@
 
        The name of the MH sequence used to tag replied messages.
 
-       _6_._4_._1_3_5  _m_h___s_e_q___u_n_s_e_e_n
+       _7_._4_._1_3_5  _m_h___s_e_q___u_n_s_e_e_n
 
        Type: string
 
@@ -6019,7 +6137,7 @@
 
        The name of the MH sequence used for unseen messages.
 
-       _6_._4_._1_3_6  _m_i_m_e___f_o_r_w_a_r_d
+       _7_._4_._1_3_6  _m_i_m_e___f_o_r_w_a_r_d
 
        Type: quadoption
 
@@ -6032,22 +6150,22 @@
        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 6.4.69  , page 99)'' and ``_$_m_i_m_e___f_o_r_-
-       _w_a_r_d___d_e_c_o_d_e (section 6.4.137  , page 115)''.
+       Also see ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.69  , page 102)'' and ``_$_m_i_m_e___f_o_r_-
+       _w_a_r_d___d_e_c_o_d_e (section 7.4.137  , page 118)''.
 
-       The Mutt Next Generation E-Mail Client                                      117
+       The Mutt Next Generation E-Mail Client                                      119
 
-       _6_._4_._1_3_7  _m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e
+       _7_._4_._1_3_7  _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 6.4.136  , page 115)'' is _s_e_t. Other-
-       wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.69  , page 99)'' is used instead.
+       a message while ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.136  , page 118)'' is _s_e_t. Other-
+       wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 7.4.69  , page 102)'' is used instead.
 
-       _6_._4_._1_3_8  _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t
+       _7_._4_._1_3_8  _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t
 
        Type: quadoption
 
@@ -6057,7 +6175,7 @@
        menu, attachments which cannot be decoded in a reasonable manner will be
        attached to the newly composed message if this option is set.
 
-       _6_._4_._1_3_9  _m_i_x___e_n_t_r_y___f_o_r_m_a_t
+       _7_._4_._1_3_9  _m_i_x___e_n_t_r_y___f_o_r_m_a_t
 
        Type: string
 
@@ -6080,7 +6198,7 @@
              %a
                    The remailer's e-mail address.
 
-       _6_._4_._1_4_0  _m_i_x_m_a_s_t_e_r
+       _7_._4_._1_4_0  _m_i_x_m_a_s_t_e_r
 
        Type: path
 
@@ -6092,19 +6210,19 @@
        used with various sets of parameters to gather the list of known remailers, and
        to finally send a message through the mixmaster chain.
 
-       The Mutt Next Generation E-Mail Client                                      118
+       The Mutt Next Generation E-Mail Client                                      120
 
-       _6_._4_._1_4_1  _m_o_v_e
+       _7_._4_._1_4_1  _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 6.4.124  , page 113)'' mailbox, or as a result of a
+       to your ``_$_m_b_o_x (section 7.4.124  , page 116)'' mailbox, or as a result of a
        ``_m_b_o_x_-_h_o_o_k (section 3.13  , page 33)'' command.
 
-       _6_._4_._1_4_2  _m_s_g_i_d___f_o_r_m_a_t
+       _7_._4_._1_4_2  _m_s_g_i_d___f_o_r_m_a_t
 
        Type: string
 
@@ -6149,7 +6267,7 @@
              %T
                    the current UNIX timestamp (decimal)
 
-       The Mutt Next Generation E-Mail Client                                      119
+       The Mutt Next Generation E-Mail Client                                      121
 
              %X
                    the current UNIX timestamp (hexadecimal)
@@ -6163,7 +6281,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.
 
-       _6_._4_._1_4_3  _n_a_r_r_o_w___t_r_e_e
+       _7_._4_._1_4_3  _n_a_r_r_o_w___t_r_e_e
 
        Type: boolean
 
@@ -6172,7 +6290,7 @@
        This variable, when _s_e_t, makes the thread tree narrower, allowing deeper
        threads to fit on the screen.
 
-       _6_._4_._1_4_4  _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o
+       _7_._4_._1_4_4  _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o
 
        Type: boolean
 
@@ -6183,7 +6301,7 @@
        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.
 
-       _6_._4_._1_4_5  _n_n_t_p___a_s_k___x___c_o_m_m_e_n_t___t_o
+       _7_._4_._1_4_5  _n_n_t_p___a_s_k___x___c_o_m_m_e_n_t___t_o
 
        Type: boolean
 
@@ -6194,7 +6312,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.
 
-       _6_._4_._1_4_6  _n_n_t_p___c_a_c_h_e___d_i_r
+       _7_._4_._1_4_6  _n_n_t_p___c_a_c_h_e___d_i_r
 
        Type: path
 
@@ -6206,12 +6324,12 @@
        ers. If _u_n_s_e_t, headers will not be saved at all and will be reloaded each time
        when you enter a newsgroup.
 
-       The Mutt Next Generation E-Mail Client                                      120
+       The Mutt Next Generation E-Mail Client                                      122
 
        As for the header caching in connection with IMAP and/or Maildir, this drasti-
        cally increases speed and lowers traffic.
 
-       _6_._4_._1_4_7  _n_n_t_p___c_a_t_c_h_u_p
+       _7_._4_._1_4_7  _n_n_t_p___c_a_t_c_h_u_p
 
        Type: quadoption
 
@@ -6222,7 +6340,7 @@
        If this variable is _s_e_t, Mutt-ng will mark all articles in a newsgroup as read
        when you leaving it.
 
-       _6_._4_._1_4_8  _n_n_t_p___c_o_n_t_e_x_t
+       _7_._4_._1_4_8  _n_n_t_p___c_o_n_t_e_x_t
 
        Type: number
 
@@ -6231,13 +6349,13 @@
        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 6.4.146  , page 118)) and how
+       caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 7.4.146  , page 121)) 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 6.4.148  ,
-       page 119), 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.148  ,
+       page 122), all older ones will be removed/not shown in the index.
 
-       _6_._4_._1_4_9  _n_n_t_p___f_o_l_l_o_w_u_p___t_o___p_o_s_t_e_r
+       _7_._4_._1_4_9  _n_n_t_p___f_o_l_l_o_w_u_p___t_o___p_o_s_t_e_r
 
        Type: quadoption
 
@@ -6249,7 +6367,7 @@
        header field, a follow-up to the newsgroup is not permitted.  The message will
        be mailed to the submitter of the message via mail.
 
-       _6_._4_._1_5_0  _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t
+       _7_._4_._1_5_0  _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t
 
        Type: string
 
@@ -6258,10 +6376,10 @@
        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 6.4.110  ,
-       page 108)'', 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.110  ,
+       page 111)'', but has its own set of printf(3)-like sequences:
 
-       The Mutt Next Generation E-Mail Client                                      121
+       The Mutt Next Generation E-Mail Client                                      123
 
             %C      current newsgroup number
             %d      description of newsgroup (retrieved from server)
@@ -6273,7 +6391,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"
 
-       _6_._4_._1_5_1  _n_n_t_p___h_o_s_t
+       _7_._4_._1_5_1  _n_n_t_p___h_o_s_t
 
        Type: string
 
@@ -6295,7 +6413,7 @@
        security risk since the superuser of your machine may read it regardless of the
        file's permissions.
 
-       _6_._4_._1_5_2  _n_n_t_p___i_n_e_w_s
+       _7_._4_._1_5_2  _n_n_t_p___i_n_e_w_s
 
        Type: path
 
@@ -6311,11 +6429,11 @@
 
        Example: set inews='/usr/local/bin/inews -hS'
 
-       _6_._4_._1_5_3  _n_n_t_p___l_o_a_d___d_e_s_c_r_i_p_t_i_o_n
+       _7_._4_._1_5_3  _n_n_t_p___l_o_a_d___d_e_s_c_r_i_p_t_i_o_n
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      122
+       The Mutt Next Generation E-Mail Client                                      124
 
        Default: yes
 
@@ -6324,7 +6442,7 @@
        This variable controls whether or not descriptions for newsgroups are to be
        loaded when subscribing to a newsgroup.
 
-       _6_._4_._1_5_4  _n_n_t_p___m_a_i_l___c_h_e_c_k
+       _7_._4_._1_5_4  _n_n_t_p___m_a_i_l___c_h_e_c_k
 
        Type: number
 
@@ -6336,7 +6454,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.).
 
-       _6_._4_._1_5_5  _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t
+       _7_._4_._1_5_5  _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t
 
        Type: boolean
 
@@ -6349,7 +6467,7 @@
 
        NNoottee:: Only change this setting if you know what you are doing.
 
-       _6_._4_._1_5_6  _n_n_t_p___n_e_w_s_r_c
+       _7_._4_._1_5_6  _n_n_t_p___n_e_w_s_r_c
 
        Type: path
 
@@ -6365,11 +6483,11 @@
 
             %s      newsserver name
 
-       _6_._4_._1_5_7  _n_n_t_p___p_a_s_s
+       _7_._4_._1_5_7  _n_n_t_p___p_a_s_s
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      123
+       The Mutt Next Generation E-Mail Client                                      125
 
        Default: ''
 
@@ -6380,7 +6498,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.
 
-       _6_._4_._1_5_8  _n_n_t_p___p_o_s_t___m_o_d_e_r_a_t_e_d
+       _7_._4_._1_5_8  _n_n_t_p___p_o_s_t___m_o_d_e_r_a_t_e_d
 
        Type: quadoption
 
@@ -6394,7 +6512,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.
 
-       _6_._4_._1_5_9  _n_n_t_p___r_e_c_o_n_n_e_c_t
+       _7_._4_._1_5_9  _n_n_t_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
 
@@ -6405,7 +6523,7 @@
        Controls whether or not Mutt-ng will try to reconnect to a newsserver when the
        was connection lost.
 
-       _6_._4_._1_6_0  _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d
+       _7_._4_._1_6_0  _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
@@ -6416,7 +6534,7 @@
        When _s_e_t, info about unsubscribed newsgroups will be saved into the ``newsrc''
        file and into the news cache.
 
-       _6_._4_._1_6_1  _n_n_t_p___s_h_o_w___n_e_w___n_e_w_s
+       _7_._4_._1_6_1  _n_n_t_p___s_h_o_w___n_e_w___n_e_w_s
 
        Type: boolean
 
@@ -6426,13 +6544,13 @@
 
        If _s_e_t, the newsserver will be asked for new newsgroups on entering the
 
-       The Mutt Next Generation E-Mail Client                                      124
+       The Mutt Next Generation E-Mail Client                                      126
 
        browser.  Otherwise, it will be done only once for a newsserver.  Also controls
        whether or not the number of new articles of subscribed newsgroups will be
        checked.
 
-       _6_._4_._1_6_2  _n_n_t_p___s_h_o_w___o_n_l_y___u_n_r_e_a_d
+       _7_._4_._1_6_2  _n_n_t_p___s_h_o_w___o_n_l_y___u_n_r_e_a_d
 
        Type: boolean
 
@@ -6443,7 +6561,7 @@
        If _s_e_t, only subscribed newsgroups that contain unread articles will be dis-
        played in the newsgroup browser.
 
-       _6_._4_._1_6_3  _n_n_t_p___u_s_e_r
+       _7_._4_._1_6_3  _n_n_t_p___u_s_e_r
 
        Type: string
 
@@ -6454,7 +6572,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.
 
-       _6_._4_._1_6_4  _n_n_t_p___x___c_o_m_m_e_n_t___t_o
+       _7_._4_._1_6_4  _n_n_t_p___x___c_o_m_m_e_n_t___t_o
 
        Type: boolean
 
@@ -6465,7 +6583,7 @@
        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.
 
-       _6_._4_._1_6_5  _o_p_e_r_a_t_i_n_g___s_y_s_t_e_m
+       _7_._4_._1_6_5  _o_p_e_r_a_t_i_n_g___s_y_s_t_e_m
 
        Type: string
 
@@ -6477,13 +6595,13 @@
 
        It may, for example, look as: ``mutt-ng 1.5.9i (Linux)''.
 
-       _6_._4_._1_6_6  _p_a_g_e_r
+       _7_._4_._1_6_6  _p_a_g_e_r
 
        Type: path
 
        Default: 'builtin'
 
-       The Mutt Next Generation E-Mail Client                                      125
+       The Mutt Next Generation E-Mail Client                                      127
 
        This variable specifies which pager you would like to use to view messages.
        ``builtin'' means to use the builtin pager, otherwise this variable should
@@ -6494,7 +6612,7 @@
        screen resizes cause lines longer than the screen width to be badly formatted
        in the help menu.
 
-       _6_._4_._1_6_7  _p_a_g_e_r___c_o_n_t_e_x_t
+       _7_._4_._1_6_7  _p_a_g_e_r___c_o_n_t_e_x_t
 
        Type: number
 
@@ -6505,7 +6623,7 @@
        will display the line after the last one on the screen at the top of the next
        page (0 lines of context).
 
-       _6_._4_._1_6_8  _p_a_g_e_r___f_o_r_m_a_t
+       _7_._4_._1_6_8  _p_a_g_e_r___f_o_r_m_a_t
 
        Type: string
 
@@ -6513,10 +6631,10 @@
 
        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 6.4.110  , page 108)''
+       sequences are listed in the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)''
        section.
 
-       _6_._4_._1_6_9  _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
+       _7_._4_._1_6_9  _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
 
        Type: number
 
@@ -6533,18 +6651,18 @@
        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.
 
-       _6_._4_._1_7_0  _p_a_g_e_r___s_t_o_p
+       _7_._4_._1_7_0  _p_a_g_e_r___s_t_o_p
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      126
+       The Mutt Next Generation E-Mail Client                                      128
 
        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.
 
-       _6_._4_._1_7_1  _p_g_p___a_u_t_o___d_e_c_o_d_e
+       _7_._4_._1_7_1  _p_g_p___a_u_t_o___d_e_c_o_d_e
 
        Type: boolean
 
@@ -6557,7 +6675,7 @@
        ditional-pgp function, Mutt-ng will automatically check the message for tradi-
        tional pgp.
 
-       _6_._4_._1_7_2  _p_g_p___a_u_t_o_i_n_l_i_n_e
+       _7_._4_._1_7_2  _p_g_p___a_u_t_o_i_n_l_i_n_e
 
        Type: boolean
 
@@ -6570,12 +6688,12 @@
        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 6.4.188  , page 129)''.
+       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.188  , page 132)''.
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       _6_._4_._1_7_3  _p_g_p___c_h_e_c_k___e_x_i_t
+       _7_._4_._1_7_3  _p_g_p___c_h_e_c_k___e_x_i_t
 
        Type: boolean
 
@@ -6584,7 +6702,7 @@
        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)
 
-       _6_._4_._1_7_4  _p_g_p___c_l_e_a_r_s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._1_7_4  _p_g_p___c_l_e_a_r_s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6594,9 +6712,9 @@
 
        Note that the use of this format is ssttrroonnggllyy ddeepprreeccaatteedd.  (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      127
+       The Mutt Next Generation E-Mail Client                                      129
 
-       _6_._4_._1_7_5  _p_g_p___d_e_c_o_d_e___c_o_m_m_a_n_d
+       _7_._4_._1_7_5  _p_g_p___d_e_c_o_d_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6619,7 +6737,7 @@
                    multipart/signed attachment when verifying it.
 
              %a
-                   The value of _$_p_g_p___s_i_g_n___a_s (section 6.4.192  , page 130).
+                   The value of _$_p_g_p___s_i_g_n___a_s (section 7.4.192  , page 133).
 
              %r
                    One or more key IDs.
@@ -6629,7 +6747,7 @@
        subdirectory which has been installed on your system alongside the documenta-
        tion.  (PGP only)
 
-       _6_._4_._1_7_6  _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._1_7_6  _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6637,7 +6755,7 @@
 
        This command is used to decrypt a PGP encrypted message.  (PGP only)
 
-       _6_._4_._1_7_7  _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d
+       _7_._4_._1_7_7  _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6645,25 +6763,25 @@
 
        This command is used to encrypt a body part without signing it.  (PGP only)
 
-       _6_._4_._1_7_8  _p_g_p___e_n_c_r_y_p_t___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._1_7_8  _p_g_p___e_n_c_r_y_p_t___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      128
+       The Mutt Next Generation E-Mail Client                                      130
 
        This command is used to both sign and encrypt a body part.  (PGP only)
 
-       _6_._4_._1_7_9  _p_g_p___e_n_t_r_y___f_o_r_m_a_t
+       _7_._4_._1_7_9  _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 6.4.110  , page
-       108)'', 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.110  , page
+       111)'', but has its own set of printf(3)-like sequences:
 
              %n
                    number
@@ -6694,7 +6812,7 @@
 
        (PGP only)
 
-       _6_._4_._1_8_0  _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d
+       _7_._4_._1_8_0  _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6703,29 +6821,29 @@
        This command is used to export a public key from the user's key ring.  (PGP
        only)
 
-       _6_._4_._1_8_1  _p_g_p___g_e_t_k_e_y_s___c_o_m_m_a_n_d
+       _7_._4_._1_8_1  _p_g_p___g_e_t_k_e_y_s___c_o_m_m_a_n_d
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      129
+       The Mutt Next Generation E-Mail Client                                      131
 
        Default: ''
 
        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)
 
-       _6_._4_._1_8_2  _p_g_p___g_o_o_d___s_i_g_n
+       _7_._4_._1_8_2  _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 6.4.198  , page 131)
+       verified if the output from _$_p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d (section 7.4.198  , page 134)
        contains the text. Use this variable if the exit code from the command is 0
        even for bad signatures.  (PGP only)
 
-       _6_._4_._1_8_3  _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s
+       _7_._4_._1_8_3  _p_g_p___i_g_n_o_r_e___s_u_b_k_e_y_s
 
        Type: boolean
 
@@ -6735,7 +6853,7 @@
        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)
 
-       _6_._4_._1_8_4  _p_g_p___i_m_p_o_r_t___c_o_m_m_a_n_d
+       _7_._4_._1_8_4  _p_g_p___i_m_p_o_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6744,7 +6862,7 @@
        This command is used to import a key from a message into the user's public key
        ring.  (PGP only)
 
-       _6_._4_._1_8_5  _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d
+       _7_._4_._1_8_5  _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6756,7 +6874,7 @@
        This format is also generated by the pgpring utility which comes with Mutt-ng.
        (PGP only)
 
-       _6_._4_._1_8_6  _p_g_p___l_i_s_t___s_e_c_r_i_n_g___c_o_m_m_a_n_d
+       _7_._4_._1_8_6  _p_g_p___l_i_s_t___s_e_c_r_i_n_g___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6764,14 +6882,14 @@
 
        This command is used to list the secret key ring's contents.  The output format
 
-       The Mutt Next Generation E-Mail Client                                      130
+       The Mutt Next Generation E-Mail Client                                      132
 
        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)
 
-       _6_._4_._1_8_7  _p_g_p___l_o_n_g___i_d_s
+       _7_._4_._1_8_7  _p_g_p___l_o_n_g___i_d_s
 
        Type: boolean
 
@@ -6780,7 +6898,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)
 
-       _6_._4_._1_8_8  _p_g_p___m_i_m_e___a_u_t_o
+       _7_._4_._1_8_8  _p_g_p___m_i_m_e___a_u_t_o
 
        Type: quadoption
 
@@ -6793,7 +6911,7 @@
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       _6_._4_._1_8_9  _p_g_p___r_e_p_l_y_i_n_l_i_n_e
+       _7_._4_._1_8_9  _p_g_p___r_e_p_l_y_i_n_l_i_n_e
 
        Type: boolean
 
@@ -6809,18 +6927,18 @@
        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 6.4.188  , page 129)''.
+       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.188  , page 132)''.
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       _6_._4_._1_9_0  _p_g_p___r_e_t_a_i_n_a_b_l_e___s_i_g_s
+       _7_._4_._1_9_0  _p_g_p___r_e_t_a_i_n_a_b_l_e___s_i_g_s
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      131
+       The Mutt Next Generation E-Mail Client                                      133
 
        If _s_e_t, signed and encrypted messages will consist of nested multipart/signed
        and multipart/encrypted body parts.
@@ -6829,7 +6947,7 @@
        the outer layer (multipart/encrypted) can be easily removed, while the inner
        multipart/signed part is retained.  (PGP only)
 
-       _6_._4_._1_9_1  _p_g_p___s_h_o_w___u_n_u_s_a_b_l_e
+       _7_._4_._1_9_1  _p_g_p___s_h_o_w___u_n_u_s_a_b_l_e
 
        Type: boolean
 
@@ -6839,7 +6957,7 @@
        This includes keys which have been revoked, have expired, or have been marked
        as ``disabled'' by the user.  (PGP only)
 
-       _6_._4_._1_9_2  _p_g_p___s_i_g_n___a_s
+       _7_._4_._1_9_2  _p_g_p___s_i_g_n___a_s
 
        Type: string
 
@@ -6849,7 +6967,7 @@
        your private keys to use.  It is recommended that you use the keyid form to
        specify your key (e.g., ``0x00112233'').  (PGP only)
 
-       _6_._4_._1_9_3  _p_g_p___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._1_9_3  _p_g_p___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6858,7 +6976,7 @@
        This command is used to create the detached PGP signature for a multi-
        part/signed PGP/MIME body part.  (PGP only)
 
-       _6_._4_._1_9_4  _p_g_p___s_o_r_t___k_e_y_s
+       _7_._4_._1_9_4  _p_g_p___s_o_r_t___k_e_y_s
 
        Type: sort order
 
@@ -6876,7 +6994,7 @@
              date
                    sort by key creation date
 
-       The Mutt Next Generation E-Mail Client                                      132
+       The Mutt Next Generation E-Mail Client                                      134
 
              trust
                    sort by the trust of the key
@@ -6884,7 +7002,7 @@
        If you prefer reverse order of the above values, prefix it with ``reverse-''.
        (PGP only)
 
-       _6_._4_._1_9_5  _p_g_p___s_t_r_i_c_t___e_n_c
+       _7_._4_._1_9_5  _p_g_p___s_t_r_i_c_t___e_n_c
 
        Type: boolean
 
@@ -6895,7 +7013,7 @@
        non-verifyable PGP signatures, so only change this if you know what you are
        doing.  (PGP only)
 
-       _6_._4_._1_9_6  _p_g_p___t_i_m_e_o_u_t
+       _7_._4_._1_9_6  _p_g_p___t_i_m_e_o_u_t
 
        Type: number
 
@@ -6904,7 +7022,7 @@
        The number of seconds after which a cached passphrase will expire if not used.
        Default: 300.  (PGP only)
 
-       _6_._4_._1_9_7  _p_g_p___u_s_e___g_p_g___a_g_e_n_t
+       _7_._4_._1_9_7  _p_g_p___u_s_e___g_p_g___a_g_e_n_t
 
        Type: boolean
 
@@ -6912,7 +7030,7 @@
 
        If _s_e_t, Mutt-ng will use a possibly-running gpg-agent process.  (PGP only)
 
-       _6_._4_._1_9_8  _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d
+       _7_._4_._1_9_8  _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6920,7 +7038,7 @@
 
        This command is used to verify PGP signatures.  (PGP only)
 
-       _6_._4_._1_9_9  _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d
+       _7_._4_._1_9_9  _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -6929,11 +7047,11 @@
        This command is used to verify key information from the key selection menu.
        (PGP only)
 
-       _6_._4_._2_0_0  _p_i_p_e___d_e_c_o_d_e
+       _7_._4_._2_0_0  _p_i_p_e___d_e_c_o_d_e
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      133
+       The Mutt Next Generation E-Mail Client                                      135
 
        Default: no
 
@@ -6941,7 +7059,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.
 
-       _6_._4_._2_0_1  _p_i_p_e___s_e_p
+       _7_._4_._2_0_1  _p_i_p_e___s_e_p
 
        Type: string
 
@@ -6950,7 +7068,7 @@
        The separator to add between messages when piping a list of tagged messages to
        an external Unix command.
 
-       _6_._4_._2_0_2  _p_i_p_e___s_p_l_i_t
+       _7_._4_._2_0_2  _p_i_p_e___s_p_l_i_t
 
        Type: boolean
 
@@ -6961,9 +7079,9 @@
        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 6.4.201  , page 132)'' separator is added after each message.
+       (section 7.4.201  , page 135)'' separator is added after each message.
 
-       _6_._4_._2_0_3  _p_o_p___a_u_t_h___t_r_y___a_l_l
+       _7_._4_._2_0_3  _p_o_p___a_u_t_h___t_r_y___a_l_l
 
        Type: boolean
 
@@ -6976,7 +7094,7 @@
        able. If a method is available but authentication fails, Mutt-ng will not con-
        nect to the POP server.
 
-       _6_._4_._2_0_4  _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
+       _7_._4_._2_0_4  _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
 
        Type: string
 
@@ -6989,7 +7107,7 @@
        tication methods are either ``user'', ``apop'' or any SASL mechanism, eg
        ``digest-md5'', ``gssapi'' or ``cram-md5''.
 
-       The Mutt Next Generation E-Mail Client                                      134
+       The Mutt Next Generation E-Mail Client                                      136
 
        This parameter is case-insensitive. If this parameter is _u_n_s_e_t (the default)
        Mutt-ng will try all available methods, in order from most-secure to least-
@@ -6997,7 +7115,7 @@
 
        Example: set pop_authenticators='digest-md5:apop:user'
 
-       _6_._4_._2_0_5  _p_o_p___d_e_l_e_t_e
+       _7_._4_._2_0_5  _p_o_p___d_e_l_e_t_e
 
        Type: quadoption
 
@@ -7009,7 +7127,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.
 
-       _6_._4_._2_0_6  _p_o_p___h_o_s_t
+       _7_._4_._2_0_6  _p_o_p___h_o_s_t
 
        Type: string
 
@@ -7025,7 +7143,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.
 
-       _6_._4_._2_0_7  _p_o_p___l_a_s_t
+       _7_._4_._2_0_7  _p_o_p___l_a_s_t
 
        Type: boolean
 
@@ -7037,7 +7155,7 @@
        retrieving only unread messages from the POP server when using the ``fetch-
        mail'' function.
 
-       _6_._4_._2_0_8  _p_o_p___m_a_i_l___c_h_e_c_k
+       _7_._4_._2_0_8  _p_o_p___m_a_i_l___c_h_e_c_k
 
        Type: number
 
@@ -7045,11 +7163,11 @@
 
        Availability: POP
 
-       The Mutt Next Generation E-Mail Client                                      135
+       The Mutt Next Generation E-Mail Client                                      137
 
        This variable configures how often (in seconds) POP should look for new mail.
 
-       _6_._4_._2_0_9  _p_o_p___p_a_s_s
+       _7_._4_._2_0_9  _p_o_p___p_a_s_s
 
        Type: string
 
@@ -7063,7 +7181,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.
 
-       _6_._4_._2_1_0  _p_o_p___r_e_c_o_n_n_e_c_t
+       _7_._4_._2_1_0  _p_o_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
 
@@ -7074,7 +7192,7 @@
        Controls whether or not Mutt-ng will try to reconnect to a POP server when the
        connection is lost.
 
-       _6_._4_._2_1_1  _p_o_p___u_s_e_r
+       _7_._4_._2_1_1  _p_o_p___u_s_e_r
 
        Type: string
 
@@ -7086,39 +7204,39 @@
 
        This variable defaults to your user name on the local machine.
 
-       _6_._4_._2_1_2  _p_o_s_t___i_n_d_e_n_t___s_t_r_i_n_g
+       _7_._4_._2_1_2  _p_o_s_t___i_n_d_e_n_t___s_t_r_i_n_g
 
        Type: string
 
        Default: ''
 
-       Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 6.4.15  , page 86)'' variable, Mutt-ng
+       Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 7.4.15  , page 89)'' variable, Mutt-ng
        will append this string after the inclusion of a message which is being replied
        to.
 
-       _6_._4_._2_1_3  _p_o_s_t_p_o_n_e
+       _7_._4_._2_1_3  _p_o_s_t_p_o_n_e
 
        Type: quadoption
 
        Default: ask-yes
 
-       The Mutt Next Generation E-Mail Client                                      136
+       The Mutt Next Generation E-Mail Client                                      138
 
        Controls whether or not messages are saved in the ``_$_p_o_s_t_p_o_n_e_d (section
-       6.4.214  , page 135)'' mailbox when you elect not to send immediately.
+       7.4.214  , page 138)'' mailbox when you elect not to send immediately.
 
-       _6_._4_._2_1_4  _p_o_s_t_p_o_n_e_d
+       _7_._4_._2_1_4  _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 6.4.213  , page 134)
+       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 7.4.213  , page 137)
        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 6.4.213  , page 134)'' variable.
+       ``_$_p_o_s_t_p_o_n_e (section 7.4.213  , page 137)'' variable.
 
-       _6_._4_._2_1_5  _p_r_e_c_o_n_n_e_c_t
+       _7_._4_._2_1_5  _p_r_e_c_o_n_n_e_c_t
 
        Type: string
 
@@ -7137,7 +7255,7 @@
        NNoottee:: For this example to work, you must be able to log in to the remote
        machine without having to enter a password.
 
-       _6_._4_._2_1_6  _p_r_i_n_t
+       _7_._4_._2_1_6  _p_r_i_n_t
 
        Type: quadoption
 
@@ -7146,7 +7264,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.
 
-       _6_._4_._2_1_7  _p_r_i_n_t___c_o_m_m_a_n_d
+       _7_._4_._2_1_7  _p_r_i_n_t___c_o_m_m_a_n_d
 
        Type: path
 
@@ -7154,49 +7272,49 @@
 
        This specifies the command pipe that should be used to print messages.
 
-       _6_._4_._2_1_8  _p_r_i_n_t___d_e_c_o_d_e
+       _7_._4_._2_1_8  _p_r_i_n_t___d_e_c_o_d_e
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      137
+       The Mutt Next Generation E-Mail Client                                      139
 
        Default: yes
 
        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 6.4.217  , page 135).  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.217  , page 138).  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.
 
-       _6_._4_._2_1_9  _p_r_i_n_t___s_p_l_i_t
+       _7_._4_._2_1_9  _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 6.4.217  , page 135) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.217  , page 138) 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 6.4.217  , page 135) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.217  , page 138) 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.
 
-       _6_._4_._2_2_0  _p_r_o_m_p_t___a_f_t_e_r
+       _7_._4_._2_2_0  _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 6.4.166  , page 123)'', setting this
+       If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 7.4.166  , page 126)'', setting this
        variable will cause Mutt-ng to prompt you for a command when the pager exits
        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.
 
-       _6_._4_._2_2_1  _q_u_e_r_y___c_o_m_m_a_n_d
+       _7_._4_._2_2_1  _q_u_e_r_y___c_o_m_m_a_n_d
 
        Type: path
 
@@ -7207,7 +7325,7 @@
        query string the user types.  See ``_q_u_e_r_y (section 4.7  , page 55)'' for more
        information.
 
-       _6_._4_._2_2_2  _q_u_i_t
+       _7_._4_._2_2_2  _q_u_i_t
 
        Type: quadoption
 
@@ -7215,22 +7333,22 @@
 
        This variable controls whether ``quit'' and ``exit'' actually quit from Mutt-
 
-       The Mutt Next Generation E-Mail Client                                      138
+       The Mutt Next Generation E-Mail Client                                      140
 
        ng.  If it set to _y_e_s, they do quit, if it is set to _n_o, they have no effect,
        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.
 
-       _6_._4_._2_2_3  _q_u_o_t_e___e_m_p_t_y
+       _7_._4_._2_2_3  _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 6.4.109  , page 108)''.
+       tion 7.4.109  , page 111)''.
 
-       _6_._4_._2_2_4  _q_u_o_t_e___q_u_o_t_e_d
+       _7_._4_._2_2_4  _q_u_o_t_e___q_u_o_t_e_d
 
        Type: boolean
 
@@ -7238,9 +7356,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 6.4.109  , page 108)''.
+       by ``_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.109  , page 111)''.
 
-       _6_._4_._2_2_5  _q_u_o_t_e___r_e_g_e_x_p
+       _7_._4_._2_2_5  _q_u_o_t_e___r_e_g_e_x_p
 
        Type: regular expression
 
@@ -7253,7 +7371,7 @@
        set this to a regular expression that matches _e_x_a_c_t_l_y the quote characters at
        the beginning of quoted lines.
 
-       _6_._4_._2_2_6  _r_e_a_d___i_n_c
+       _7_._4_._2_2_6  _r_e_a_d___i_n_c
 
        Type: number
 
@@ -7267,11 +7385,11 @@
        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 6.4.340  , page 165)'' variable.
+       Also see the ``_$_w_r_i_t_e___i_n_c (section 7.4.340  , page 168)'' variable.
 
-       _6_._4_._2_2_7  _r_e_a_d___o_n_l_y
+       _7_._4_._2_2_7  _r_e_a_d___o_n_l_y
 
-       The Mutt Next Generation E-Mail Client                                      139
+       The Mutt Next Generation E-Mail Client                                      141
 
        Type: boolean
 
@@ -7279,7 +7397,7 @@
 
        If set, all folders are opened in read-only mode.
 
-       _6_._4_._2_2_8  _r_e_a_l_n_a_m_e
+       _7_._4_._2_2_8  _r_e_a_l_n_a_m_e
 
        Type: string
 
@@ -7291,20 +7409,20 @@
        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 6.4.74  , page 100) variable.
+       _$_f_r_o_m (section 7.4.74  , page 103) variable.
 
-       _6_._4_._2_2_9  _r_e_c_a_l_l
+       _7_._4_._2_2_9  _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 6.4.214  , page 135)''.
+       message.  Also see ``_$_p_o_s_t_p_o_n_e_d (section 7.4.214  , page 138)''.
 
        Setting this variable to _y_e_s is not generally useful, and thus not recommended.
 
-       _6_._4_._2_3_0  _r_e_c_o_r_d
+       _7_._4_._2_3_0  _r_e_c_o_r_d
 
        Type: path
 
@@ -7315,12 +7433,12 @@
        another way to do this is using the ``_m_y___h_d_r (section 3.15  , page 34)'' com-
        mand to create a Bcc: header field with your email address in it.)
 
-       The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _6_._4_._2_3_0  _, _p_a_g_e _1_3_8_) is overridden by the
-       ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 98)'' and ``_$_s_a_v_e___n_a_m_e (section
-       6.4.241  , page 141)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18  , page
+       The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _7_._4_._2_3_0  _, _p_a_g_e _1_4_1_) is overridden by the
+       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 101)'' and ``_$_s_a_v_e___n_a_m_e (section
+       7.4.241  , page 144)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18  , page
        35)'' command.
 
-       _6_._4_._2_3_1  _r_e_p_l_y___r_e_g_e_x_p
+       _7_._4_._2_3_1  _r_e_p_l_y___r_e_g_e_x_p
 
        Type: regular expression
 
@@ -7328,12 +7446,12 @@
 
        A regular expression used to recognize reply messages when threading and
 
-       The Mutt Next Generation E-Mail Client                                      140
+       The Mutt Next Generation E-Mail Client                                      142
 
        replying. The default value corresponds to the English ``Re:'' and the German
        ``Aw:''.
 
-       _6_._4_._2_3_2  _r_e_p_l_y___s_e_l_f
+       _7_._4_._2_3_2  _r_e_p_l_y___s_e_l_f
 
        Type: boolean
 
@@ -7343,7 +7461,7 @@
        that you want to reply to the recipients of that message rather than to your-
        self.
 
-       _6_._4_._2_3_3  _r_e_p_l_y___t_o
+       _7_._4_._2_3_3  _r_e_p_l_y___t_o
 
        Type: quadoption
 
@@ -7357,7 +7475,7 @@
        header field to the list address and you want to send a private message to the
        author of a message.
 
-       _6_._4_._2_3_4  _r_e_s_o_l_v_e
+       _7_._4_._2_3_4  _r_e_s_o_l_v_e
 
        Type: boolean
 
@@ -7367,7 +7485,7 @@
        undeleted) message whenever a command that modifies the current message is exe-
        cuted.
 
-       _6_._4_._2_3_5  _r_e_v_e_r_s_e___a_l_i_a_s
+       _7_._4_._2_3_5  _r_e_v_e_r_s_e___a_l_i_a_s
 
        Type: boolean
 
@@ -7385,12 +7503,12 @@
 
        It would be displayed in the index menu as ``Joe User'' instead of
 
-       The Mutt Next Generation E-Mail Client                                      141
+       The Mutt Next Generation E-Mail Client                                      143
 
        ``abd30425@somewhere.net.''  This is useful when the person's e-mail address is
        not human friendly (like CompuServe addresses).
 
-       _6_._4_._2_3_6  _r_e_v_e_r_s_e___n_a_m_e
+       _7_._4_._2_3_6  _r_e_v_e_r_s_e___n_a_m_e
 
        Type: boolean
 
@@ -7404,19 +7522,19 @@
        would be used doesn't match your alternates, the From: line will use your
        address on the current machine.
 
-       _6_._4_._2_3_7  _r_e_v_e_r_s_e___r_e_a_l_n_a_m_e
+       _7_._4_._2_3_7  _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 6.4.236  ,
-       page 140) 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.236  ,
+       page 143) 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 6.4.228  , page 138) variable.
+       (section 7.4.228  , page 141) variable.
 
-       _6_._4_._2_3_8  _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s
+       _7_._4_._2_3_8  _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s
 
        Type: boolean
 
@@ -7438,33 +7556,33 @@
        _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.
 
-       _6_._4_._2_3_9  _s_a_v_e___a_d_d_r_e_s_s
+       _7_._4_._2_3_9  _s_a_v_e___a_d_d_r_e_s_s
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      142
+       The Mutt Next Generation E-Mail Client                                      144
 
        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 6.4.241  , page 141)'' or
-       ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 98)'' 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.241  , page 144)'' or
+       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 101)'' is _s_e_t too, the selection of the
        fcc folder will be changed as well.
 
-       _6_._4_._2_4_0  _s_a_v_e___e_m_p_t_y
+       _7_._4_._2_4_0  _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 6.4.297  , page 154)'' which is
+       closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 7.4.297  , page 157)'' 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.
 
-       _6_._4_._2_4_1  _s_a_v_e___n_a_m_e
+       _7_._4_._2_4_1  _s_a_v_e___n_a_m_e
 
        Type: boolean
 
@@ -7472,14 +7590,14 @@
 
        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 6.4.64  ,
-       page 97)'' 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.64  ,
+       page 100)'' 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 6.4.230  , page 138)'' mailbox.
+       the message is saved to the ``_$_r_e_c_o_r_d (section 7.4.230  , page 141)'' mailbox.
 
-       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 98)'' variable.
+       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 101)'' variable.
 
-       _6_._4_._2_4_2  _s_c_o_r_e
+       _7_._4_._2_4_2  _s_c_o_r_e
 
        Type: boolean
 
@@ -7487,9 +7605,9 @@
 
        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 ``_$_s_c_o_r_e___t_h_r_e_s_h_-
-       _o_l_d___d_e_l_e_t_e (section 6.4.243  , page 141)'' variable and friends are used.
+       _o_l_d___d_e_l_e_t_e (section 7.4.243  , page 144)'' variable and friends are used.
 
-       _6_._4_._2_4_3  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
+       _7_._4_._2_4_3  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
 
        Type: number
 
@@ -7499,11 +7617,11 @@
        this variable are automatically marked for deletion by Mutt-ng.  Since Mutt-ng
        scores are always greater than or equal to zero, the default setting of this
 
-       The Mutt Next Generation E-Mail Client                                      143
+       The Mutt Next Generation E-Mail Client                                      145
 
        variable will never mark a message for deletion.
 
-       _6_._4_._2_4_4  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g
+       _7_._4_._2_4_4  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g
 
        Type: number
 
@@ -7512,7 +7630,7 @@
        Messages which have been assigned a score greater than or equal to this vari-
        able's value are automatically marked ``flagged''.
 
-       _6_._4_._2_4_5  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d
+       _7_._4_._2_4_5  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d
 
        Type: number
 
@@ -7523,7 +7641,7 @@
        scores are always greater than or equal to zero, the default setting of this
        variable will never mark a message read.
 
-       _6_._4_._2_4_6  _s_e_n_d___c_h_a_r_s_e_t
+       _7_._4_._2_4_6  _s_e_n_d___c_h_a_r_s_e_t
 
        Type: string
 
@@ -7531,12 +7649,12 @@
 
        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 6.4.24  , page 88)'' is not iso-8859-1 and recipients may not under-
+       (section 7.4.24  , page 91)'' 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
        instead of or after iso-8859-1.
 
-       _6_._4_._2_4_7  _s_e_n_d_m_a_i_l
+       _7_._4_._2_4_7  _s_e_n_d_m_a_i_l
 
        Type: path
 
@@ -7546,17 +7664,17 @@
        Mutt-ng expects that the specified program interprets additional arguments as
        recipient addresses.
 
-       _6_._4_._2_4_8  _s_e_n_d_m_a_i_l___w_a_i_t
+       _7_._4_._2_4_8  _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 6.4.247  ,
-       page 142)'' 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.247  ,
+       page 145)'' process to finish before giving up and putting delivery in the
        background.
 
-       The Mutt Next Generation E-Mail Client                                      144
+       The Mutt Next Generation E-Mail Client                                      146
 
        Mutt-ng interprets the value of this variable as follows:
 
@@ -7573,7 +7691,7 @@
        will be put in a temporary file.  If there is some error, you will be informed
        as to where to find the output.
 
-       _6_._4_._2_4_9  _s_h_e_l_l
+       _7_._4_._2_4_9  _s_h_e_l_l
 
        Type: path
 
@@ -7582,17 +7700,17 @@
        Command to use when spawning a subshell.  By default, the user's login shell
        from /etc/passwd is used.
 
-       _6_._4_._2_5_0  _s_i_d_e_b_a_r___b_o_u_n_d_a_r_y
+       _7_._4_._2_5_0  _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
-       6.4.254  , page 144) is _s_e_t, this variable specifies the characters at which to
+       7.4.254  , page 147) is _s_e_t, this variable specifies the characters at which to
        split a folder name into ``hierarchy items.''
 
-       _6_._4_._2_5_1  _s_i_d_e_b_a_r___d_e_l_i_m
+       _7_._4_._2_5_1  _s_i_d_e_b_a_r___d_e_l_i_m
 
        Type: string
 
@@ -7601,7 +7719,7 @@
        This specifies the delimiter between the sidebar (if visible) and other
        screens.
 
-       _6_._4_._2_5_2  _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y
+       _7_._4_._2_5_2  _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y
 
        Type: boolean
 
@@ -7609,11 +7727,11 @@
 
        If _s_e_t, only folders with new mail will be shown in the sidebar.
 
-       _6_._4_._2_5_3  _s_i_d_e_b_a_r___n_u_m_b_e_r___f_o_r_m_a_t
+       _7_._4_._2_5_3  _s_i_d_e_b_a_r___n_u_m_b_e_r___f_o_r_m_a_t
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      145
+       The Mutt Next Generation E-Mail Client                                      147
 
        Default: '%m%?n?(%n)?%?f?[%f]?'
 
@@ -7646,7 +7764,7 @@
        1) These expandos only have a non-zero value for the current mailbox and will
        always be zero otherwise.
 
-       _6_._4_._2_5_4  _s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y
+       _7_._4_._2_5_4  _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
 
@@ -7654,15 +7772,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
-       6.4.256  , page 145)'' is set to a too low value). For example, if the news-
+       7.4.256  , page 148)'' 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 6.4.250  , page 143) variable.
+       _b_a_r___b_o_u_n_d_a_r_y (section 7.4.250  , page 146) variable.
 
-       _6_._4_._2_5_5  _s_i_d_e_b_a_r___v_i_s_i_b_l_e
+       _7_._4_._2_5_5  _s_i_d_e_b_a_r___v_i_s_i_b_l_e
 
        Type: boolean
 
@@ -7670,11 +7788,11 @@
 
        This specifies whether or not to show the sidebar (a list of folders specified
 
-       The Mutt Next Generation E-Mail Client                                      146
+       The Mutt Next Generation E-Mail Client                                      148
 
        with the ``mailboxes'' command).
 
-       _6_._4_._2_5_6  _s_i_d_e_b_a_r___w_i_d_t_h
+       _7_._4_._2_5_6  _s_i_d_e_b_a_r___w_i_d_t_h
 
        Type: number
 
@@ -7682,14 +7800,14 @@
 
        The width of the sidebar.
 
-       _6_._4_._2_5_7  _s_i_g___d_a_s_h_e_s
+       _7_._4_._2_5_7  _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 6.4.259  , page 145)''.  It is ssttrroonnggllyy recommended
+       your ``_$_s_i_g_n_a_t_u_r_e (section 7.4.259  , page 148)''.  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.
@@ -7697,7 +7815,7 @@
        For example, Mutt-ng has the ability to highlight the signature in a different
        color in the builtin pager.
 
-       _6_._4_._2_5_8  _s_i_g___o_n___t_o_p
+       _7_._4_._2_5_8  _s_i_g___o_n___t_o_p
 
        Type: boolean
 
@@ -7708,7 +7826,7 @@
        know what you are doing, and are prepared to take some heat from netiquette
        guardians.
 
-       _6_._4_._2_5_9  _s_i_g_n_a_t_u_r_e
+       _7_._4_._2_5_9  _s_i_g_n_a_t_u_r_e
 
        Type: path
 
@@ -7718,7 +7836,7 @@
        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.
 
-       _6_._4_._2_6_0  _s_i_g_n_o_f_f___s_t_r_i_n_g
+       _7_._4_._2_6_0  _s_i_g_n_o_f_f___s_t_r_i_n_g
 
        Type: string
 
@@ -7727,13 +7845,13 @@
        If _s_e_t, this string will be inserted before the signature. This is useful for
        people that want to sign off every message they send with their name.
 
-       The Mutt Next Generation E-Mail Client                                      147
+       The Mutt Next Generation E-Mail Client                                      149
 
        If you want to insert your website's URL, additional contact information or
        witty quotes into your mails, better use a signature file instead of the sig-
        noff string.
 
-       _6_._4_._2_6_1  _s_i_m_p_l_e___s_e_a_r_c_h
+       _7_._4_._2_6_1  _s_i_m_p_l_e___s_e_a_r_c_h
 
        Type: string
 
@@ -7741,7 +7859,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 6.2  , page 78)'' for more information on search patterns.
+       ``_p_a_t_t_e_r_n_s (section 7.2  , page 80)'' 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
@@ -7749,7 +7867,7 @@
 
        ~f joe | ~s joe
 
-       _6_._4_._2_6_2  _s_l_e_e_p___t_i_m_e
+       _7_._4_._2_6_2  _s_l_e_e_p___t_i_m_e
 
        Type: number
 
@@ -7760,7 +7878,7 @@
        the current folder.  The default is to pause one second, so a value of zero for
        this option suppresses the pause.
 
-       _6_._4_._2_6_3  _s_m_a_r_t___w_r_a_p
+       _7_._4_._2_6_3  _s_m_a_r_t___w_r_a_p
 
        Type: boolean
 
@@ -7768,22 +7886,22 @@
 
        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 6.4.121  ,
-       page 112)'' variable.
+       simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 7.4.121  ,
+       page 115)'' variable.
 
-       _6_._4_._2_6_4  _s_m_i_l_e_y_s
+       _7_._4_._2_6_4  _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 6.4.225  , page 137)'', most notably smileys in the
+       ``_$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.225  , page 140)'', most notably smileys in the
        beginning of a line
 
-       _6_._4_._2_6_5  _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l
+       _7_._4_._2_6_5  _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l
 
-       The Mutt Next Generation E-Mail Client                                      148
+       The Mutt Next Generation E-Mail Client                                      150
 
        Type: boolean
 
@@ -7793,7 +7911,7 @@
        cate about to be added to the database or not. It is _s_e_t by default.  (S/MIME
        only)
 
-       _6_._4_._2_6_6  _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n
+       _7_._4_._2_6_6  _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n
 
        Type: path
 
@@ -7802,7 +7920,7 @@
        This variable contains the name of either a directory, or a file which contains
        trusted certificates for use with OpenSSL.  (S/MIME only)
 
-       _6_._4_._2_6_7  _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s
+       _7_._4_._2_6_7  _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s
 
        Type: path
 
@@ -7815,7 +7933,7 @@
        address keyid pairs, and which can be manually edited. This one points to the
        location of the certificates.  (S/MIME only)
 
-       _6_._4_._2_6_8  _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._2_6_8  _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7835,10 +7953,10 @@
                    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 6.4.270  ,
-                   page 148)
+                   The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 7.4.270  ,
+                   page 151)
 
-       The Mutt Next Generation E-Mail Client                                      149
+       The Mutt Next Generation E-Mail Client                                      151
 
              %c
                    One or more certificate IDs.
@@ -7848,15 +7966,15 @@
 
              %C
                    CA location:  Depending on whether _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section
-                   6.4.266  , page 147) 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 6.4.266  , page 147)' or
-                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.266  , page 147)'.
+                   7.4.266  , page 150) 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.266  , page 150)' or
+                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.266  , page 150)'.
 
        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)
 
-       _6_._4_._2_6_9  _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_6_9  _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
 
@@ -7867,7 +7985,7 @@
        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)
 
-       _6_._4_._2_7_0  _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y
+       _7_._4_._2_7_0  _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y
 
        Type: string
 
@@ -7876,7 +7994,7 @@
        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)
 
-       _6_._4_._2_7_1  _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_1  _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7884,7 +8002,7 @@
 
        This command is used to create encrypted S/MIME messages.  (S/MIME only)
 
-       _6_._4_._2_7_2  _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h
+       _7_._4_._2_7_2  _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h
 
        Type: string
 
@@ -7895,9 +8013,9 @@
 
        If _u_n_s_e_t ``_3_d_e_s'' (TripleDES) is used.  (S/MIME only)
 
-       The Mutt Next Generation E-Mail Client                                      150
+       The Mutt Next Generation E-Mail Client                                      152
 
-       _6_._4_._2_7_3  _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_3  _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7906,7 +8024,7 @@
        This command is used to extract X509 certificates from a PKCS7 structure.
        (S/MIME only)
 
-       _6_._4_._2_7_4  _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_4  _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
 
@@ -7916,7 +8034,7 @@
        tificates, and for verification purposes (to check whether the certificate was
        issued for the sender's mailbox).  (S/MIME only)
 
-       _6_._4_._2_7_5  _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_7_5  _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
 
@@ -7926,7 +8044,7 @@
        signature, so that the certificate's owner may get compared to the email's
        ``From:'' header field.  (S/MIME only)
 
-       _6_._4_._2_7_6  _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_6  _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7934,7 +8052,7 @@
 
        This command is used to import a certificate via smime_keysng.  (S/MIME only)
 
-       _6_._4_._2_7_7  _s_m_i_m_e___i_s___d_e_f_a_u_l_t
+       _7_._4_._2_7_7  _s_m_i_m_e___i_s___d_e_f_a_u_l_t
 
        Type: boolean
 
@@ -7947,11 +8065,11 @@
        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 6.4.37  , page 91).)  (S/MIME only)
+       tion 7.4.37  , page 94).)  (S/MIME only)
 
-       _6_._4_._2_7_8  _s_m_i_m_e___k_e_y_s
+       _7_._4_._2_7_8  _s_m_i_m_e___k_e_y_s
 
-       The Mutt Next Generation E-Mail Client                                      151
+       The Mutt Next Generation E-Mail Client                                      153
 
        Type: path
 
@@ -7964,7 +8082,7 @@
        address keyid pair, and which can be manually edited. This one points to the
        location of the private keys.  (S/MIME only)
 
-       _6_._4_._2_7_9  _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_9  _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7973,7 +8091,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)
 
-       _6_._4_._2_8_0  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._2_8_0  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7982,7 +8100,7 @@
        This command is used to created S/MIME signatures of type multipart/signed,
        which can be read by all mail clients.  (S/MIME only)
 
-       _6_._4_._2_8_1  _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d
+       _7_._4_._2_8_1  _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7992,7 +8110,7 @@
        pkcs7-signature, which can only be handled by mail clients supporting the
        S/MIME extension.  (S/MIME only)
 
-       _6_._4_._2_8_2  _s_m_i_m_e___t_i_m_e_o_u_t
+       _7_._4_._2_8_2  _s_m_i_m_e___t_i_m_e_o_u_t
 
        Type: number
 
@@ -8001,18 +8119,18 @@
        The number of seconds after which a cached passphrase will expire if not used.
        (S/MIME only)
 
-       _6_._4_._2_8_3  _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d
+       _7_._4_._2_8_3  _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      152
+       The Mutt Next Generation E-Mail Client                                      154
 
        This command is used to verify S/MIME signatures of type multipart/signed.
        (S/MIME only)
 
-       _6_._4_._2_8_4  _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_4  _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
 
@@ -8021,7 +8139,7 @@
        This command is used to verify S/MIME signatures of type application/x-
        pkcs7-mime.  (S/MIME only)
 
-       _6_._4_._2_8_5  _s_m_t_p___e_n_v_e_l_o_p_e
+       _7_._4_._2_8_5  _s_m_t_p___e_n_v_e_l_o_p_e
 
        Type: string
 
@@ -8036,7 +8154,7 @@
        envelope sender but only a particular one which may not be the same as the
        user's desired From: header.
 
-       _6_._4_._2_8_6  _s_m_t_p___h_o_s_t
+       _7_._4_._2_8_6  _s_m_t_p___h_o_s_t
 
        Type: string
 
@@ -8046,9 +8164,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 6.4.247  , page 142)'', and any associated variables.
+       _m_a_i_l (section 7.4.247  , page 145)'', and any associated variables.
 
-       _6_._4_._2_8_7  _s_m_t_p___p_a_s_s
+       _7_._4_._2_8_7  _s_m_t_p___p_a_s_s
 
        Type: string
 
@@ -8057,15 +8175,15 @@
        Availability: SMTP
 
        Defines the password to use with SMTP AUTH.  If ``_$_s_m_t_p___u_s_e_r (section
-       6.4.290  , page 152)'' is set, but this variable is not, you will be prompted
+       7.4.290  , page 155)'' 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.
 
-       The Mutt Next Generation E-Mail Client                                      153
+       The Mutt Next Generation E-Mail Client                                      155
 
-       _6_._4_._2_8_8  _s_m_t_p___p_o_r_t
+       _7_._4_._2_8_8  _s_m_t_p___p_o_r_t
 
        Type: number
 
@@ -8079,7 +8197,7 @@
        Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP servers
        will probably desire 587, the mail submission port.
 
-       _6_._4_._2_8_9  _s_m_t_p___u_s_e___t_l_s
+       _7_._4_._2_8_9  _s_m_t_p___u_s_e___t_l_s
 
        Type: string
 
@@ -8093,7 +8211,7 @@
        continue without TLS in case of an error.  Muttng still needs to have SSL sup-
        port enabled in order to use it.
 
-       _6_._4_._2_9_0  _s_m_t_p___u_s_e_r
+       _7_._4_._2_9_0  _s_m_t_p___u_s_e_r
 
        Type: string
 
@@ -8104,7 +8222,7 @@
        Defines the username to use with SMTP AUTH.  Setting this variable will cause
        Mutt-ng to attempt to use SMTP AUTH when sending.
 
-       _6_._4_._2_9_1  _s_o_r_t
+       _7_._4_._2_9_1  _s_o_r_t
 
        Type: sort order
 
@@ -8112,7 +8230,7 @@
 
        Specifies how to sort messages in the _i_n_d_e_x menu.  Valid values are:
 
-       The Mutt Next Generation E-Mail Client                                      154
+       The Mutt Next Generation E-Mail Client                                      156
 
                date or date-sent
                date-received
@@ -8128,7 +8246,7 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort=reverse-date-sent).
 
-       _6_._4_._2_9_2  _s_o_r_t___a_l_i_a_s
+       _7_._4_._2_9_2  _s_o_r_t___a_l_i_a_s
 
        Type: sort order
 
@@ -8141,7 +8259,7 @@
                alias (sort alphabetically by alias name)
                unsorted (leave in order specified in .muttrc)
 
-       _6_._4_._2_9_3  _s_o_r_t___a_u_x
+       _7_._4_._2_9_3  _s_o_r_t___a_u_x
 
        Type: sort order
 
@@ -8149,7 +8267,7 @@
 
        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 6.4.291  , page 152)'' can,
+       This can be set to any value that ``_$_s_o_r_t (section 7.4.291  , page 155)'' 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
@@ -8160,13 +8278,13 @@
        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 6.4.291  , page 152)'' order _$_s_o_r_t___a_u_x
-       (section 6.4.293  , page 153) is reversed again (which is not the right thing
+       NNoottee:: For reversed ``_$_s_o_r_t (section 7.4.291  , page 155)'' order _$_s_o_r_t___a_u_x
+       (section 7.4.293  , page 156) is reversed again (which is not the right thing
        to do, but kept to not break any existing configuration setting).
 
-       The Mutt Next Generation E-Mail Client                                      155
+       The Mutt Next Generation E-Mail Client                                      157
 
-       _6_._4_._2_9_4  _s_o_r_t___b_r_o_w_s_e_r
+       _7_._4_._2_9_4  _s_o_r_t___b_r_o_w_s_e_r
 
        Type: sort order
 
@@ -8183,35 +8301,35 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort_browser=reverse-date).
 
-       _6_._4_._2_9_5  _s_o_r_t___r_e
+       _7_._4_._2_9_5  _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 6.4.312  , page 160)'' _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 6.4.295  ,
-       page 154) _s_e_t, Mutt-ng will only attach a message as the child of another mes-
+       (section 7.4.312  , page 163)'' _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.295  ,
+       page 157) _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 6.4.231  , page 138)''. With
-       _$_s_o_r_t___r_e (section 6.4.295  , page 154) _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.231  , page 141)''. With
+       _$_s_o_r_t___r_e (section 7.4.295  , page 157) _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
-       6.4.231  , page 138)'' parts of both messages are identical.
+       7.4.231  , page 141)'' parts of both messages are identical.
 
-       _6_._4_._2_9_6  _s_p_a_m___s_e_p_a_r_a_t_o_r
+       _7_._4_._2_9_6  _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 6.4.296  , page 154)'' controls what happens when
+       ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.296  , page 157)'' 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 6.4.296  ,
-       page 154)'' as a separator.
+       match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.296  ,
+       page 157)'' as a separator.
 
-       _6_._4_._2_9_7  _s_p_o_o_l_f_i_l_e
+       _7_._4_._2_9_7  _s_p_o_o_l_f_i_l_e
 
        Type: path
 
@@ -8219,13 +8337,13 @@
 
        If your spool mailbox is in a non-default place where Mutt-ng cannot find it,
 
-       The Mutt Next Generation E-Mail Client                                      156
+       The Mutt Next Generation E-Mail Client                                      158
 
        you can specify its location with this variable.  Mutt-ng will automatically
        set this variable to the value of the environment variable $MAIL if it is not
        set.
 
-       _6_._4_._2_9_8  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
+       _7_._4_._2_9_8  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
 
        Type: path
 
@@ -8237,7 +8355,7 @@
 
        Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 
-       _6_._4_._2_9_9  _s_s_l___c_l_i_e_n_t___c_e_r_t
+       _7_._4_._2_9_9  _s_s_l___c_l_i_e_n_t___c_e_r_t
 
        Type: path
 
@@ -8247,7 +8365,7 @@
 
        The file containing a client certificate and its associated private key.
 
-       _6_._4_._3_0_0  _s_s_l___f_o_r_c_e___t_l_s
+       _7_._4_._3_0_0  _s_s_l___f_o_r_c_e___t_l_s
 
        Type: boolean
 
@@ -8257,9 +8375,9 @@
        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
        abort the connection anyway. This option supersedes ``_$_s_s_l___s_t_a_r_t_t_l_s (section
-       6.4.302  , page 155)''.
+       7.4.302  , page 158)''.
 
-       _6_._4_._3_0_1  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
+       _7_._4_._3_0_1  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
 
        Type: number
 
@@ -8271,11 +8389,11 @@
        any Diffie-Hellman key exchange. A value of 0 will use the default from the
        GNUTLS library.
 
-       _6_._4_._3_0_2  _s_s_l___s_t_a_r_t_t_l_s
+       _7_._4_._3_0_2  _s_s_l___s_t_a_r_t_t_l_s
 
        Type: quadoption
 
-       The Mutt Next Generation E-Mail Client                                      157
+       The Mutt Next Generation E-Mail Client                                      159
 
        Default: yes
 
@@ -8285,7 +8403,7 @@
        ing the capability. When _u_n_s_e_t, Mutt-ng will not attempt to use STARTTLS
        regardless of the server's capabilities.
 
-       _6_._4_._3_0_3  _s_s_l___u_s_e___s_s_l_v_2
+       _7_._4_._3_0_3  _s_s_l___u_s_e___s_s_l_v_2
 
        Type: boolean
 
@@ -8296,7 +8414,7 @@
        This variables specifies whether to attempt to use SSLv2 in the SSL authentica-
        tion process.
 
-       _6_._4_._3_0_4  _s_s_l___u_s_e___s_s_l_v_3
+       _7_._4_._3_0_4  _s_s_l___u_s_e___s_s_l_v_3
 
        Type: boolean
 
@@ -8307,7 +8425,7 @@
        This variables specifies whether to attempt to use SSLv3 in the SSL authentica-
        tion process.
 
-       _6_._4_._3_0_5  _s_s_l___u_s_e___t_l_s_v_1
+       _7_._4_._3_0_5  _s_s_l___u_s_e___t_l_s_v_1
 
        Type: boolean
 
@@ -8318,7 +8436,7 @@
        This variables specifies whether to attempt to use TLSv1 in the SSL authentica-
        tion process.
 
-       _6_._4_._3_0_6  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
+       _7_._4_._3_0_6  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
 
        Type: boolean
 
@@ -8329,16 +8447,16 @@
        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.
 
-       _6_._4_._3_0_7  _s_t_a_t_u_s___c_h_a_r_s
+       _7_._4_._3_0_7  _s_t_a_t_u_s___c_h_a_r_s
 
-       The Mutt Next Generation E-Mail Client                                      158
+       The Mutt Next Generation E-Mail Client                                      160
 
        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 6.4.308  , page 157)''. The first character is used when the mailbox is
+       tion 7.4.308  , page 160)''. 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
@@ -8347,7 +8465,7 @@
        been opened in attach-message mode (Certain operations like composing a new
        mail, replying, forwarding, etc. are not permitted in this mode).
 
-       _6_._4_._3_0_8  _s_t_a_t_u_s___f_o_r_m_a_t
+       _7_._4_._3_0_8  _s_t_a_t_u_s___f_o_r_m_a_t
 
        Type: string
 
@@ -8356,7 +8474,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 6.4.110  , page 108)'', but has
+       string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)'', but has
        its own set of printf(3)-like sequences:
 
              %b
@@ -8387,7 +8505,7 @@
              %m
                    the number of messages in the mailbox *
 
-       The Mutt Next Generation E-Mail Client                                      159
+       The Mutt Next Generation E-Mail Client                                      161
 
              %M
                    the number of messages shown (i.e., which match the current limit)
@@ -8407,14 +8525,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 6.4.307  , page 156)
+                   to _$_s_t_a_t_u_s___c_h_a_r_s (section 7.4.307  , page 159)
 
              %s
-                   current sorting mode (_$_s_o_r_t (section 6.4.291  , page 152))
+                   current sorting mode (_$_s_o_r_t (section 7.4.291  , page 155))
 
              %S
-                   current aux sorting method (_$_s_o_r_t___a_u_x (section 6.4.293  , page
-                   153))
+                   current aux sorting method (_$_s_o_r_t___a_u_x (section 7.4.293  , page
+                   156))
 
              %t
                    number of tagged messages *
@@ -8444,7 +8562,7 @@
 
        %?<sequence_char>?<optional_string>?
 
-       The Mutt Next Generation E-Mail Client                                      160
+       The Mutt Next Generation E-Mail Client                                      162
 
        where _s_e_q_u_e_n_c_e___c_h_a_r is a character from the table above, and _o_p_t_i_o_n_a_l___s_t_r_i_n_g is
        the string you would like printed if _s_e_q_u_e_n_c_e___c_h_a_r is nonzero.  _o_p_t_i_o_n_a_l___s_t_r_i_n_g
@@ -8472,7 +8590,7 @@
        replace any dots in the expansion by underscores. This might be helpful with
        IMAP folders that don't like dots in folder names.
 
-       _6_._4_._3_0_9  _s_t_a_t_u_s___o_n___t_o_p
+       _7_._4_._3_0_9  _s_t_a_t_u_s___o_n___t_o_p
 
        Type: boolean
 
@@ -8481,7 +8599,7 @@
        Setting this variable causes the ``status bar'' to be displayed on the first
        line of the screen rather than near the bottom.
 
-       _6_._4_._3_1_0  _s_t_r_i_c_t___m_a_i_l_t_o
+       _7_._4_._3_1_0  _s_t_r_i_c_t___m_a_i_l_t_o
 
        Type: boolean
 
@@ -8489,65 +8607,65 @@
 
        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 6.4.54  , page 95)'' is unset.
+       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98)'' is unset.
 
        If this variable is _s_e_t, mutt-ng is strict and allows anything to be changed.
        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 6.4.54  , page 95)'' is set to.
+       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98)'' is set to.
 
-       _6_._4_._3_1_1  _s_t_r_i_c_t___m_i_m_e
+       _7_._4_._3_1_1  _s_t_r_i_c_t___m_i_m_e
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      161
+       The Mutt Next Generation E-Mail Client                                      163
 
        Default: yes
 
        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 6.4.11  , page 85).
+       Express).  See also _$_a_s_s_u_m_e_d___c_h_a_r_s_e_t (section 7.4.11  , page 88).
 
        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.
 
-       _6_._4_._3_1_2  _s_t_r_i_c_t___t_h_r_e_a_d_s
+       _7_._4_._3_1_2  _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 6.4.291  , page 152)'' by mes-
+       ences:'' header fields when you ``_$_s_o_r_t (section 7.4.291  , page 155)'' 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.
 
-       _6_._4_._3_1_3  _s_t_r_i_p___w_a_s
+       _7_._4_._3_1_3  _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 6.4.314  , page 160) when replying. This is
+       matches _$_s_t_r_i_p___w_a_s___r_e_g_e_x (section 7.4.314  , page 163) when replying. This is
        useful to properly react on subject changes and reduce ``subject noise.'' (esp.
        in Usenet)
 
-       _6_._4_._3_1_4  _s_t_r_i_p___w_a_s___r_e_g_e_x
+       _7_._4_._3_1_4  _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 6.4.313  , page 160) is _s_e_t, mutt-ng
+       When non-empty and _$_s_t_r_i_p___w_a_s (section 7.4.313  , page 163) is _s_e_t, mutt-ng
        will remove this trailing part of the ``Subject'' line when replying if it
        won't be empty afterwards.
 
-       _6_._4_._3_1_5  _s_t_u_f_f___q_u_o_t_e_d
+       _7_._4_._3_1_5  _s_t_u_f_f___q_u_o_t_e_d
 
        Type: boolean
 
@@ -8556,9 +8674,9 @@
        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.
 
-       The Mutt Next Generation E-Mail Client                                      162
+       The Mutt Next Generation E-Mail Client                                      164
 
-       _6_._4_._3_1_6  _s_u_s_p_e_n_d
+       _7_._4_._3_1_6  _s_u_s_p_e_n_d
 
        Type: boolean
 
@@ -8568,7 +8686,7 @@
        usually CTRL+Z. This is useful if you run Mutt-ng inside an xterm using a com-
        mand like ``xterm -e muttng.''
 
-       _6_._4_._3_1_7  _t_e_x_t___f_l_o_w_e_d
+       _7_._4_._3_1_7  _t_e_x_t___f_l_o_w_e_d
 
        Type: boolean
 
@@ -8579,21 +8697,21 @@
        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 6.4.109  , page 108) is ignored when this
+       Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.109  , page 111) is ignored when this
        option is set.
 
-       _6_._4_._3_1_8  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
+       _7_._4_._3_1_8  _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 6.2  , page 78)'' above.  If _s_e_t, the headers and attachments of messages
+       tion 7.2  , page 80)'' 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.
 
-       _6_._4_._3_1_9  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
+       _7_._4_._3_1_9  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
 
        Type: boolean
 
@@ -8602,7 +8720,7 @@
        When _s_e_t, Mutt-ng uses the date received rather than the date sent to thread
        messages by subject.
 
-       _6_._4_._3_2_0  _t_i_l_d_e
+       _7_._4_._3_2_0  _t_i_l_d_e
 
        Type: boolean
 
@@ -8611,9 +8729,9 @@
        When _s_e_t, the internal-pager will pad blank lines to the bottom of the screen
        with a tilde (~).
 
-       The Mutt Next Generation E-Mail Client                                      163
+       The Mutt Next Generation E-Mail Client                                      165
 
-       _6_._4_._3_2_1  _t_i_m_e_o_u_t
+       _7_._4_._3_2_1  _t_i_m_e_o_u_t
 
        Type: number
 
@@ -8623,7 +8741,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.
 
-       _6_._4_._3_2_2  _t_m_p_d_i_r
+       _7_._4_._3_2_2  _t_m_p_d_i_r
 
        Type: path
 
@@ -8634,7 +8752,7 @@
        set, the environment variable $TMPDIR is used.  If $TMPDIR is not set then
        '/tmp' is used.
 
-       _6_._4_._3_2_3  _t_o___c_h_a_r_s
+       _7_._4_._3_2_3  _t_o___c_h_a_r_s
 
        Type: string
 
@@ -8650,7 +8768,7 @@
        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).
 
-       _6_._4_._3_2_4  _t_r_a_s_h
+       _7_._4_._3_2_4  _t_r_a_s_h
 
        Type: path
 
@@ -8662,13 +8780,13 @@
        NNoottee: When you delete a message in the trash folder, it is really deleted, so
        that there is no way to recover mail.
 
-       _6_._4_._3_2_5  _t_u_n_n_e_l
+       _7_._4_._3_2_5  _t_u_n_n_e_l
 
        Type: string
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      164
+       The Mutt Next Generation E-Mail Client                                      166
 
        Setting this variable will cause Mutt-ng to open a pipe to a command instead of
        a raw socket. You may be able to use this to set up preauthenticated connec-
@@ -8679,7 +8797,7 @@
        NNoottee:: For this example to work you must be able to log in to the remote machine
        without having to enter a password.
 
-       _6_._4_._3_2_6  _u_m_a_s_k
+       _7_._4_._3_2_6  _u_m_a_s_k
 
        Type: number
 
@@ -8688,7 +8806,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.
 
-       _6_._4_._3_2_7  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
+       _7_._4_._3_2_7  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
 
        Type: boolean
 
@@ -8697,7 +8815,7 @@
        When _s_e_t, Mutt-ng will jump to the next unread message, if any, when the cur-
        rent thread is _u_ncollapsed.
 
-       _6_._4_._3_2_8  _u_s_e___8_b_i_t_m_i_m_e
+       _7_._4_._3_2_8  _u_s_e___8_b_i_t_m_i_m_e
 
        Type: boolean
 
@@ -8708,23 +8826,23 @@
        with the SMTP support via libESMTP.  Otherwise you may not be able to send
        mail.
 
-       When _s_e_t, Mutt-ng will either invoke ``_$_s_e_n_d_m_a_i_l (section 6.4.247  , page
-       142)'' 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.247  , page
+       145)'' with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP
        negotiation or tell libESMTP to do so.
 
-       _6_._4_._3_2_9  _u_s_e___d_o_m_a_i_n
+       _7_._4_._3_2_9  _u_s_e___d_o_m_a_i_n
 
        Type: boolean
 
        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 6.4.89  , page 103)''.  If _u_n_s_e_t,
+       tion) with the value of ``_$_h_o_s_t_n_a_m_e (section 7.4.89  , page 106)''.  If _u_n_s_e_t,
        no addresses will be qualified.
 
-       _6_._4_._3_3_0  _u_s_e___f_r_o_m
+       _7_._4_._3_3_0  _u_s_e___f_r_o_m
 
-       The Mutt Next Generation E-Mail Client                                      165
+       The Mutt Next Generation E-Mail Client                                      167
 
        Type: boolean
 
@@ -8734,7 +8852,7 @@
        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 34)'' command.
 
-       _6_._4_._3_3_1  _u_s_e___i_d_n
+       _7_._4_._3_3_1  _u_s_e___i_d_n
 
        Type: boolean
 
@@ -8747,7 +8865,7 @@
        NNoottee:: You can use IDNs for addresses even if this is _u_n_s_e_t.  This variable only
        affects decoding.
 
-       _6_._4_._3_3_2  _u_s_e___i_p_v_6
+       _7_._4_._3_3_2  _u_s_e___i_p_v_6
 
        Type: boolean
 
@@ -8757,7 +8875,7 @@
        If this option is _u_n_s_e_t, Mutt-ng will restrict itself to IPv4 addresses.  Nor-
        mally, the default should work.
 
-       _6_._4_._3_3_3  _u_s_e_r___a_g_e_n_t
+       _7_._4_._3_3_3  _u_s_e_r___a_g_e_n_t
 
        Type: boolean
 
@@ -8766,7 +8884,7 @@
        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.
 
-       _6_._4_._3_3_4  _v_i_s_u_a_l
+       _7_._4_._3_3_4  _v_i_s_u_a_l
 
        Type: path
 
@@ -8775,13 +8893,13 @@
        Specifies the visual editor to invoke when the _~_v command is given in the
        builtin editor.
 
-       _6_._4_._3_3_5  _w_a_i_t___k_e_y
+       _7_._4_._3_3_5  _w_a_i_t___k_e_y
 
        Type: boolean
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      166
+       The Mutt Next Generation E-Mail Client                                      168
 
        Controls whether Mutt-ng will ask you to press a key after _s_h_e_l_l_- _e_s_c_a_p_e, _p_i_p_e_-
        _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.
@@ -8793,7 +8911,7 @@
        When _s_e_t, Mutt-ng will always ask for a key. When _u_n_s_e_t, Mutt-ng will wait for
        a key only if the external command returned a non-zero status.
 
-       _6_._4_._3_3_6  _w_e_e_d
+       _7_._4_._3_3_6  _w_e_e_d
 
        Type: boolean
 
@@ -8802,7 +8920,7 @@
        When _s_e_t, Mutt-ng will weed headers when displaying, forwarding, printing, or
        replying to messages.
 
-       _6_._4_._3_3_7  _w_r_a_p___s_e_a_r_c_h
+       _7_._4_._3_3_7  _w_r_a_p___s_e_a_r_c_h
 
        Type: boolean
 
@@ -8813,7 +8931,7 @@
        When _s_e_t, searches will wrap around the first (or last) message. When _u_n_s_e_t,
        searches will not wrap.
 
-       _6_._4_._3_3_8  _w_r_a_p_m_a_r_g_i_n
+       _7_._4_._3_3_8  _w_r_a_p_m_a_r_g_i_n
 
        Type: number
 
@@ -8822,7 +8940,7 @@
        Controls the size of the margin remaining at the right side of the terminal
        when Mutt-ng's pager does smart wrapping.
 
-       _6_._4_._3_3_9  _w_r_i_t_e___b_c_c
+       _7_._4_._3_3_9  _w_r_i_t_e___b_c_c
 
        Type: boolean
 
@@ -8831,37 +8949,37 @@
        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.
 
-       _6_._4_._3_4_0  _w_r_i_t_e___i_n_c
+       _7_._4_._3_4_0  _w_r_i_t_e___i_n_c
 
        Type: number
 
        Default: 10
 
-       The Mutt Next Generation E-Mail Client                                      167
+       The Mutt Next Generation E-Mail Client                                      169
 
        When writing a mailbox, a message will be printed every _w_r_i_t_e___i_n_c messages to
        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 6.4.226  , page 137)'' variable.
+       Also see the ``_$_r_e_a_d___i_n_c (section 7.4.226  , page 140)'' variable.
 
-       _6_._4_._3_4_1  _x_t_e_r_m___i_c_o_n
+       _7_._4_._3_4_1  _x_t_e_r_m___i_c_o_n
 
        Type: string
 
        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 6.4.343  , page 166) 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 6.4.308  , page 157)''.
+       tion 7.4.343  , page 169) 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.308  , page 160)''.
 
-       _6_._4_._3_4_2  _x_t_e_r_m___l_e_a_v_e
+       _7_._4_._3_4_2  _x_t_e_r_m___l_e_a_v_e
 
        Type: string
 
        Default: ''
 
-       If _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 6.4.343  , page 166) 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.343  , page 169) 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.
@@ -8871,7 +8989,7 @@
        set xterm_leave = '`test x$DISPLAY != x && xprop -id $WINDOWID | grep WM_NAME |
        cut -d ''' -f 2`'
 
-       _6_._4_._3_4_3  _x_t_e_r_m___s_e_t___t_i_t_l_e_s
+       _7_._4_._3_4_3  _x_t_e_r_m___s_e_t___t_i_t_l_e_s
 
        Type: boolean
 
@@ -8881,27 +8999,27 @@
        you're in an appropriate terminal). The default must be _u_n_s_e_t to force in the
        validity checking.
 
-       _6_._4_._3_4_4  _x_t_e_r_m___t_i_t_l_e
+       _7_._4_._3_4_4  _x_t_e_r_m___t_i_t_l_e
 
        Type: string
 
        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 6.4.343  , page 166) 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 6.4.308  ,
-       page 157)''.
+       _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.343  , page 169) 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.308  ,
+       page 160)''.
 
-       The Mutt Next Generation E-Mail Client                                      168
+       The Mutt Next Generation E-Mail Client                                      170
 
-       _6_._5  _F_u_n_c_t_i_o_n_s
+       _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.
 
-       _6_._5_._1  _g_e_n_e_r_i_c
+       _7_._5_._1  _g_e_n_e_r_i_c
 
        The _g_e_n_e_r_i_c menu is not a real menu, but specifies common functions (such as
        movement) available in all menus except for _p_a_g_e_r and _e_d_i_t_o_r.  Changing set-
@@ -8940,9 +9058,9 @@
             top-page                   H   move to the top of the page
             what-key           not bound   display the keycode for a key press
 
-       _6_._5_._2  _i_n_d_e_x
+       _7_._5_._2  _i_n_d_e_x
 
-       The Mutt Next Generation E-Mail Client                                      169
+       The Mutt Next Generation E-Mail Client                                      171
 
             bounce-message             b   remail a message to another user
             change-folder              c   open a different folder
@@ -8999,7 +9117,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                                      170
+       The Mutt Next Generation E-Mail Client                                      172
 
             sort-mailbox               o   sort messages
             sort-reverse               O   sort messages in reverse order
@@ -9015,9 +9133,9 @@
             untag-pattern             ^T   untag messages matching a pattern
             view-attachments           v   show MIME attachments
 
-       _6_._5_._3  _p_a_g_e_r
+       _7_._5_._3  _p_a_g_e_r
 
-       The Mutt Next Generation E-Mail Client                                      171
+       The Mutt Next Generation E-Mail Client                                      173
 
             bottom             not bound   jump to the bottom of the message
             bounce-message             b   remail a message to another user
@@ -9074,7 +9192,7 @@
             recall-message             R   recall a postponed message
             redraw-screen             ^L   clear and redraw the screen
 
-       The Mutt Next Generation E-Mail Client                                      172
+       The Mutt Next Generation E-Mail Client                                      174
 
             reply                      r   reply to a message
             save-message               s   save message/attachment to a file
@@ -9095,13 +9213,13 @@
             undelete-thread           ^U   undelete all messages in thread
             view-attachments           v   show MIME attachments
 
-       _6_._5_._4  _a_l_i_a_s
+       _7_._5_._4  _a_l_i_a_s
 
             search                     /   search for a regular expression
             search-next                n   search for next match
             search-reverse         ESC /   search backwards for a regular expression
 
-       _6_._5_._5  _q_u_e_r_y
+       _7_._5_._5  _q_u_e_r_y
 
             create-alias               a   create an alias from a message sender
             mail                       m   compose a new mail message
@@ -9112,9 +9230,9 @@
             search-opposite    not bound   search for next match in opposite direction
             search-reverse         ESC /   search backwards for a regular expression
 
-       _6_._5_._6  _a_t_t_a_c_h
+       _7_._5_._6  _a_t_t_a_c_h
 
-       The Mutt Next Generation E-Mail Client                                      173
+       The Mutt Next Generation E-Mail Client                                      175
 
             bounce-message             b   remail a message to another user
             collapse-parts             v   toggle display of subparts
@@ -9135,9 +9253,9 @@
             view-mailcap               m   force viewing of attachment using mailcap
             view-text                  T   view attachment as text
 
-       _6_._5_._7  _c_o_m_p_o_s_e
+       _7_._5_._7  _c_o_m_p_o_s_e
 
-       The Mutt Next Generation E-Mail Client                                      174
+       The Mutt Next Generation E-Mail Client                                      176
 
             attach-file                a   attach a file(s) to this message
             attach-message             A   attach message(s) to this message
@@ -9173,14 +9291,14 @@
             view-attach              RET   view attachment using mailcap entry if necessary
             write-fcc         w   write the message to a folder
 
-       _6_._5_._8  _p_o_s_t_p_o_n_e
+       _7_._5_._8  _p_o_s_t_p_o_n_e
 
             delete-entry               d   delete the current entry
             undelete-entry             u   undelete the current entry
 
-       _6_._5_._9  _b_r_o_w_s_e_r
+       _7_._5_._9  _b_r_o_w_s_e_r
 
-       The Mutt Next Generation E-Mail Client                                      175
+       The Mutt Next Generation E-Mail Client                                      177
 
             change-dir                 c   change directories
             check-new                TAB   check mailboxes for new mail
@@ -9197,12 +9315,12 @@
             unsubscribe                u   unsubscribe to current mailbox (IMAP Only)
             toggle-subscribed          T   toggle view all/subscribed mailboxes (IMAP Only)
 
-       _6_._5_._1_0  _p_g_p
+       _7_._5_._1_0  _p_g_p
 
             view-name                  %   view the key's user id
             verify-key                 c   verify a PGP public key
 
-       _6_._5_._1_1  _e_d_i_t_o_r
+       _7_._5_._1_1  _e_d_i_t_o_r
 
             backspace          BackSpace   delete the char in front of the cursor
             backward-char             ^B   move the cursor one character to the left
@@ -9227,11 +9345,11 @@
             transpose-chars    not bound   transpose character under cursor with previous
             upcase-word            ESC u   uppercase all characters in current word
 
-       _7_.  _M_i_s_c_e_l_l_a_n_y
+       _8_.  _M_i_s_c_e_l_l_a_n_y
 
-       The Mutt Next Generation E-Mail Client                                      176
+       The Mutt Next Generation E-Mail Client                                      178
 
-       _7_._1  _A_c_k_n_o_w_l_e_d_g_m_e_n_t_s
+       _8_._1  _A_c_k_n_o_w_l_e_d_g_m_e_n_t_s
 
        Kari Hurtta <kari.hurtta@fmi.fi> co-developed the original MIME parsing code
        back in the ELM-ME days.
@@ -9286,7 +9404,7 @@
 
        Felix von Leitner (a.k.a ``Fefe'') <leitner@math.fu-berlin.de>,
 
-       The Mutt Next Generation E-Mail Client                                      177
+       The Mutt Next Generation E-Mail Client                                      179
 
        Brandon Long <blong@fiction.net>,
 
@@ -9342,14 +9460,14 @@
 
        Elimar Riesebieter <riesebie@lxtec.de>
 
-       The Mutt Next Generation E-Mail Client                                      178
+       The Mutt Next Generation E-Mail Client                                      180
 
-       _7_._2  _A_b_o_u_t _t_h_i_s _d_o_c_u_m_e_n_t
+       _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                                      179
+       The Mutt Next Generation E-Mail Client                                      181
 
                                           CONTENTS
 
@@ -9489,392 +9607,402 @@
            5.5   MIME Multipart/Alternative   ..................................... 76
            5.6   MIME Lookup   .................................................... 76
 
-       6.  Reference   ............................................................ 77
-           6.1   Command line options   ........................................... 77
-           6.2   Patterns   ....................................................... 78
-           6.3   Configuration Commands   ......................................... 80
-           6.4   Configuration variables .......................................... 82
-                 6.4.1    abort_nosubject   83
-                 6.4.2    abort_unmodified   84
-                 6.4.3    alias_file   84
-                 6.4.4    alias_format   84
-                 6.4.5    allow_8bit   84
-                 6.4.6    allow_ansi   85
-                 6.4.7    arrow_cursor   85
-                 6.4.8    ascii_chars   85
-                 6.4.9    askbcc   85
-                 6.4.10   askcc   85
-                 6.4.11   assumed_charset   86
-                 6.4.12   attach_format   86
-                 6.4.13   attach_sep   87
-                 6.4.14   attach_split   87
-                 6.4.15   attribution   87
-                 6.4.16   auto_tag   87
-                 6.4.17   autoedit   88
-                 6.4.18   beep   88
-                 6.4.19   beep_new   88
-                 6.4.20   bounce   88
+       6.  Security Considerations     ............................................ 77
+           6.1   Passwords       .................................................. 77
+           6.2   Temporary Files       ............................................ 77
+           6.3   Information Leaks     ............................................ 78
+                 6.3.1    Message-ID: headers         78
+                 6.3.2    mailto:-style links         78
+           6.4   External applications       ...................................... 78
+                 6.4.1    mailcap           78
+                 6.4.2    Other           79
+
+       7.  Reference   ............................................................ 79
+           7.1   Command line options   ........................................... 79
+           7.2   Patterns   ....................................................... 80
+           7.3   Configuration Commands   ......................................... 82
+           7.4   Configuration variables .......................................... 84
+                 7.4.1    abort_nosubject   85
+                 7.4.2    abort_unmodified   86
+                 7.4.3    alias_file   86
+                 7.4.4    alias_format   86
+                 7.4.5    allow_8bit   86
+                 7.4.6    allow_ansi   87
+                 7.4.7    arrow_cursor   87
+                 7.4.8    ascii_chars   87
+                 7.4.9    askbcc   87
+                 7.4.10   askcc   87
 
                                              iii
 
-                 6.4.21   bounce_delivered   88
-                 6.4.22   braille_friendly   89
-                 6.4.23   certificate_file   89
-                 6.4.24   charset   89
-                 6.4.25   check_new   89
-                 6.4.26   collapse_unread   90
-                 6.4.27   compose_format   90
-                 6.4.28   config_charset   90
-                 6.4.29   confirmappend   90
-                 6.4.30   confirmcreate   91
-                 6.4.31   connect_timeout   91
-                 6.4.32   content_type   91
-                 6.4.33   copy   91
-                 6.4.34   crypt_autoencrypt   91
-                 6.4.35   crypt_autopgp   92
-                 6.4.36   crypt_autosign   92
-                 6.4.37   crypt_autosmime   92
-                 6.4.38   crypt_replyencrypt   92
-                 6.4.39   crypt_replysign   92
-                 6.4.40   crypt_replysignencrypted   93
-                 6.4.41   crypt_timestamp   93
-                 6.4.42   crypt_use_gpgme   93
-                 6.4.43   crypt_verify_sig   93
-                 6.4.44   date_format   93
-                 6.4.45   default_hook   94
-                 6.4.46   delete   94
-                 6.4.47   delete_untag   94
-                 6.4.48   digest_collapse   94
-                 6.4.49   display_filter   95
-                 6.4.50   dotlock_program   95
-                 6.4.51   dsn_notify   95
-                 6.4.52   dsn_return   95
-                 6.4.53   duplicate_threads   96
-                 6.4.54   edit_headers   96
-                 6.4.55   editor   96
-                 6.4.56   encode_from   96
-                 6.4.57   entropy_file   96
-                 6.4.58   envelope_from   97
-                 6.4.59   escape   97
-                 6.4.60   fast_reply   97
-                 6.4.61   fcc_attach   97
-                 6.4.62   fcc_clear   97
-                 6.4.63   file_charset   97
-                 6.4.64   folder   98
-                 6.4.65   folder_format   98
-                 6.4.66   followup_to   99
-                 6.4.67   force_buffy_check   99
-                 6.4.68   force_name   99
-                 6.4.69   forward_decode   100
-                 6.4.70   forward_decrypt   100
-                 6.4.71   forward_edit   100
-                 6.4.72   forward_format   100
-                 6.4.73   forward_quote   100
+                 7.4.11   assumed_charset   88
+                 7.4.12   attach_format   88
+                 7.4.13   attach_sep   89
+                 7.4.14   attach_split   89
+                 7.4.15   attribution   89
+                 7.4.16   auto_tag   89
+                 7.4.17   autoedit   90
+                 7.4.18   beep   90
+                 7.4.19   beep_new   90
+                 7.4.20   bounce   90
+                 7.4.21   bounce_delivered   90
+                 7.4.22   braille_friendly   91
+                 7.4.23   certificate_file   91
+                 7.4.24   charset   91
+                 7.4.25   check_new   91
+                 7.4.26   collapse_unread   92
+                 7.4.27   compose_format   92
+                 7.4.28   config_charset   92
+                 7.4.29   confirmappend   92
+                 7.4.30   confirmcreate   93
+                 7.4.31   connect_timeout   93
+                 7.4.32   content_type   93
+                 7.4.33   copy   93
+                 7.4.34   crypt_autoencrypt   93
+                 7.4.35   crypt_autopgp   94
+                 7.4.36   crypt_autosign   94
+                 7.4.37   crypt_autosmime   94
+                 7.4.38   crypt_replyencrypt   94
+                 7.4.39   crypt_replysign   94
+                 7.4.40   crypt_replysignencrypted   95
+                 7.4.41   crypt_timestamp   95
+                 7.4.42   crypt_use_gpgme   95
+                 7.4.43   crypt_verify_sig   95
+                 7.4.44   date_format   95
+                 7.4.45   default_hook   96
+                 7.4.46   delete   96
+                 7.4.47   delete_untag   96
+                 7.4.48   digest_collapse   96
+                 7.4.49   display_filter   97
+                 7.4.50   dotlock_program   97
+                 7.4.51   dsn_notify   97
+                 7.4.52   dsn_return   97
+                 7.4.53   duplicate_threads   98
+                 7.4.54   edit_headers   98
+                 7.4.55   editor   98
+                 7.4.56   encode_from   98
+                 7.4.57   entropy_file   98
+                 7.4.58   envelope_from   99
+                 7.4.59   escape   99
+                 7.4.60   fast_reply   99
+                 7.4.61   fcc_attach   99
+                 7.4.62   fcc_clear   99
+                 7.4.63   file_charset   99
 
                                               iv
 
-                 6.4.74   from   101
-                 6.4.75   gecos_mask   101
-                 6.4.76   hdrs   101
-                 6.4.77   header   101
-                 6.4.78   header_cache   102
-                 6.4.79   header_cache_compress   102
-                 6.4.80   help   102
-                 6.4.81   hidden_host   102
-                 6.4.82   hide_limited   103
-                 6.4.83   hide_missing   103
-                 6.4.84   hide_thread_subject   103
-                 6.4.85   hide_top_limited   103
-                 6.4.86   hide_top_missing   103
-                 6.4.87   history   103
-                 6.4.88   honor_followup_to   104
-                 6.4.89   hostname   104
-                 6.4.90   ignore_list_reply_to   104
-                 6.4.91   imap_authenticators   104
-                 6.4.92   imap_check_subscribed   105
-                 6.4.93   imap_delim_chars   105
-                 6.4.94   imap_headers   105
-                 6.4.95   imap_home_namespace   105
-                 6.4.96   imap_keepalive   106
-                 6.4.97   imap_list_subscribed   106
-                 6.4.98   imap_login   106
-                 6.4.99   imap_mail_check   106
-                 6.4.100  imap_pass   107
-                 6.4.101  imap_passive   107
-                 6.4.102  imap_peek   107
-                 6.4.103  imap_reconnect   107
-                 6.4.104  imap_servernoise   108
-                 6.4.105  imap_user   108
-                 6.4.106  implicit_autoview   108
-                 6.4.107  include   108
-                 6.4.108  include_onlyfirst   108
-                 6.4.109  indent_string   109
-                 6.4.110  index_format   109
-                 6.4.111  ispell   111
-                 6.4.112  keep_flagged   112
-                 6.4.113  list_reply   112
-                 6.4.114  locale   112
-                 6.4.115  mail_check   112
-                 6.4.116  mailcap_path   112
-                 6.4.117  mailcap_sanitize   113
-                 6.4.118  maildir_header_cache_verify   113
-                 6.4.119  maildir_trash   113
-                 6.4.120  mark_old   113
-                 6.4.121  markers   114
-                 6.4.122  mask   114
-                 6.4.123  max_line_length   114
-                 6.4.124  mbox   114
-                 6.4.125  mbox_type   114
-                 6.4.126  menu_context   114
+                 7.4.64   folder   100
+                 7.4.65   folder_format   100
+                 7.4.66   followup_to   101
+                 7.4.67   force_buffy_check   101
+                 7.4.68   force_name   101
+                 7.4.69   forward_decode   102
+                 7.4.70   forward_decrypt   102
+                 7.4.71   forward_edit   102
+                 7.4.72   forward_format   102
+                 7.4.73   forward_quote   102
+                 7.4.74   from   103
+                 7.4.75   gecos_mask   103
+                 7.4.76   hdrs   103
+                 7.4.77   header   103
+                 7.4.78   header_cache   104
+                 7.4.79   header_cache_compress   104
+                 7.4.80   help   104
+                 7.4.81   hidden_host   104
+                 7.4.82   hide_limited   105
+                 7.4.83   hide_missing   105
+                 7.4.84   hide_thread_subject   105
+                 7.4.85   hide_top_limited   105
+                 7.4.86   hide_top_missing   105
+                 7.4.87   history   105
+                 7.4.88   honor_followup_to   106
+                 7.4.89   hostname   106
+                 7.4.90   ignore_list_reply_to   106
+                 7.4.91   imap_authenticators   106
+                 7.4.92   imap_check_subscribed   107
+                 7.4.93   imap_delim_chars   107
+                 7.4.94   imap_headers   107
+                 7.4.95   imap_home_namespace   107
+                 7.4.96   imap_keepalive   108
+                 7.4.97   imap_list_subscribed   108
+                 7.4.98   imap_login   108
+                 7.4.99   imap_mail_check   108
+                 7.4.100  imap_pass   109
+                 7.4.101  imap_passive   109
+                 7.4.102  imap_peek   109
+                 7.4.103  imap_reconnect   109
+                 7.4.104  imap_servernoise   110
+                 7.4.105  imap_user   110
+                 7.4.106  implicit_autoview   110
+                 7.4.107  include   110
+                 7.4.108  include_onlyfirst   110
+                 7.4.109  indent_string   111
+                 7.4.110  index_format   111
+                 7.4.111  ispell   113
+                 7.4.112  keep_flagged   114
+                 7.4.113  list_reply   114
+                 7.4.114  locale   114
+                 7.4.115  mail_check   114
+                 7.4.116  mailcap_path   114
 
                                               v
 
-                 6.4.127  menu_move_off   115
-                 6.4.128  menu_scroll   115
-                 6.4.129  message_format   115
-                 6.4.130  meta_key   115
-                 6.4.131  metoo   115
-                 6.4.132  mh_purge   116
-                 6.4.133  mh_seq_flagged   116
-                 6.4.134  mh_seq_replied   116
-                 6.4.135  mh_seq_unseen   116
-                 6.4.136  mime_forward   116
-                 6.4.137  mime_forward_decode   117
-                 6.4.138  mime_forward_rest   117
-                 6.4.139  mix_entry_format   117
-                 6.4.140  mixmaster   117
-                 6.4.141  move   118
-                 6.4.142  msgid_format   118
-                 6.4.143  narrow_tree   119
-                 6.4.144  nntp_ask_followup_to   119
-                 6.4.145  nntp_ask_x_comment_to   119
-                 6.4.146  nntp_cache_dir   119
-                 6.4.147  nntp_catchup   120
-                 6.4.148  nntp_context   120
-                 6.4.149  nntp_followup_to_poster   120
-                 6.4.150  nntp_group_index_format   120
-                 6.4.151  nntp_host   121
-                 6.4.152  nntp_inews   121
-                 6.4.153  nntp_load_description   121
-                 6.4.154  nntp_mail_check   122
-                 6.4.155  nntp_mime_subject   122
-                 6.4.156  nntp_newsrc   122
-                 6.4.157  nntp_pass   122
-                 6.4.158  nntp_post_moderated   123
-                 6.4.159  nntp_reconnect   123
-                 6.4.160  nntp_save_unsubscribed   123
-                 6.4.161  nntp_show_new_news   123
-                 6.4.162  nntp_show_only_unread   124
-                 6.4.163  nntp_user   124
-                 6.4.164  nntp_x_comment_to   124
-                 6.4.165  operating_system   124
-                 6.4.166  pager   124
-                 6.4.167  pager_context   125
-                 6.4.168  pager_format   125
-                 6.4.169  pager_index_lines   125
-                 6.4.170  pager_stop   125
-                 6.4.171  pgp_auto_decode   126
-                 6.4.172  pgp_autoinline   126
-                 6.4.173  pgp_check_exit   126
-                 6.4.174  pgp_clearsign_command   126
-                 6.4.175  pgp_decode_command   127
-                 6.4.176  pgp_decrypt_command   127
-                 6.4.177  pgp_encrypt_only_command   127
-                 6.4.178  pgp_encrypt_sign_command   127
-                 6.4.179  pgp_entry_format   128
+                 7.4.117  mailcap_sanitize   115
+                 7.4.118  maildir_header_cache_verify   115
+                 7.4.119  maildir_trash   115
+                 7.4.120  mark_old   115
+                 7.4.121  markers   116
+                 7.4.122  mask   116
+                 7.4.123  max_line_length   116
+                 7.4.124  mbox   116
+                 7.4.125  mbox_type   116
+                 7.4.126  menu_context   116
+                 7.4.127  menu_move_off   117
+                 7.4.128  menu_scroll   117
+                 7.4.129  message_format   117
+                 7.4.130  meta_key   117
+                 7.4.131  metoo   117
+                 7.4.132  mh_purge   118
+                 7.4.133  mh_seq_flagged   118
+                 7.4.134  mh_seq_replied   118
+                 7.4.135  mh_seq_unseen   118
+                 7.4.136  mime_forward   118
+                 7.4.137  mime_forward_decode   119
+                 7.4.138  mime_forward_rest   119
+                 7.4.139  mix_entry_format   119
+                 7.4.140  mixmaster   119
+                 7.4.141  move   120
+                 7.4.142  msgid_format   120
+                 7.4.143  narrow_tree   121
+                 7.4.144  nntp_ask_followup_to   121
+                 7.4.145  nntp_ask_x_comment_to   121
+                 7.4.146  nntp_cache_dir   121
+                 7.4.147  nntp_catchup   122
+                 7.4.148  nntp_context   122
+                 7.4.149  nntp_followup_to_poster   122
+                 7.4.150  nntp_group_index_format   122
+                 7.4.151  nntp_host   123
+                 7.4.152  nntp_inews   123
+                 7.4.153  nntp_load_description   123
+                 7.4.154  nntp_mail_check   124
+                 7.4.155  nntp_mime_subject   124
+                 7.4.156  nntp_newsrc   124
+                 7.4.157  nntp_pass   124
+                 7.4.158  nntp_post_moderated   125
+                 7.4.159  nntp_reconnect   125
+                 7.4.160  nntp_save_unsubscribed   125
+                 7.4.161  nntp_show_new_news   125
+                 7.4.162  nntp_show_only_unread   126
+                 7.4.163  nntp_user   126
+                 7.4.164  nntp_x_comment_to   126
+                 7.4.165  operating_system   126
+                 7.4.166  pager   126
+                 7.4.167  pager_context   127
+                 7.4.168  pager_format   127
+                 7.4.169  pager_index_lines   127
 
                                               vi
 
-                 6.4.180  pgp_export_command   128
-                 6.4.181  pgp_getkeys_command   128
-                 6.4.182  pgp_good_sign   129
-                 6.4.183  pgp_ignore_subkeys   129
-                 6.4.184  pgp_import_command   129
-                 6.4.185  pgp_list_pubring_command   129
-                 6.4.186  pgp_list_secring_command   129
-                 6.4.187  pgp_long_ids   130
-                 6.4.188  pgp_mime_auto   130
-                 6.4.189  pgp_replyinline   130
-                 6.4.190  pgp_retainable_sigs   130
-                 6.4.191  pgp_show_unusable   131
-                 6.4.192  pgp_sign_as   131
-                 6.4.193  pgp_sign_command   131
-                 6.4.194  pgp_sort_keys   131
-                 6.4.195  pgp_strict_enc   132
-                 6.4.196  pgp_timeout   132
-                 6.4.197  pgp_use_gpg_agent   132
-                 6.4.198  pgp_verify_command   132
-                 6.4.199  pgp_verify_key_command   132
-                 6.4.200  pipe_decode   132
-                 6.4.201  pipe_sep   133
-                 6.4.202  pipe_split   133
-                 6.4.203  pop_auth_try_all   133
-                 6.4.204  pop_authenticators   133
-                 6.4.205  pop_delete   134
-                 6.4.206  pop_host   134
-                 6.4.207  pop_last   134
-                 6.4.208  pop_mail_check   134
-                 6.4.209  pop_pass   135
-                 6.4.210  pop_reconnect   135
-                 6.4.211  pop_user   135
-                 6.4.212  post_indent_string   135
-                 6.4.213  postpone   135
-                 6.4.214  postponed   136
-                 6.4.215  preconnect   136
-                 6.4.216  print   136
-                 6.4.217  print_command   136
-                 6.4.218  print_decode   136
-                 6.4.219  print_split   137
-                 6.4.220  prompt_after   137
-                 6.4.221  query_command   137
-                 6.4.222  quit   137
-                 6.4.223  quote_empty   138
-                 6.4.224  quote_quoted   138
-                 6.4.225  quote_regexp   138
-                 6.4.226  read_inc   138
-                 6.4.227  read_only   138
-                 6.4.228  realname   139
-                 6.4.229  recall   139
-                 6.4.230  record   139
-                 6.4.231  reply_regexp   139
-                 6.4.232  reply_self   140
+                 7.4.170  pager_stop   127
+                 7.4.171  pgp_auto_decode   128
+                 7.4.172  pgp_autoinline   128
+                 7.4.173  pgp_check_exit   128
+                 7.4.174  pgp_clearsign_command   128
+                 7.4.175  pgp_decode_command   129
+                 7.4.176  pgp_decrypt_command   129
+                 7.4.177  pgp_encrypt_only_command   129
+                 7.4.178  pgp_encrypt_sign_command   129
+                 7.4.179  pgp_entry_format   130
+                 7.4.180  pgp_export_command   130
+                 7.4.181  pgp_getkeys_command   130
+                 7.4.182  pgp_good_sign   131
+                 7.4.183  pgp_ignore_subkeys   131
+                 7.4.184  pgp_import_command   131
+                 7.4.185  pgp_list_pubring_command   131
+                 7.4.186  pgp_list_secring_command   131
+                 7.4.187  pgp_long_ids   132
+                 7.4.188  pgp_mime_auto   132
+                 7.4.189  pgp_replyinline   132
+                 7.4.190  pgp_retainable_sigs   132
+                 7.4.191  pgp_show_unusable   133
+                 7.4.192  pgp_sign_as   133
+                 7.4.193  pgp_sign_command   133
+                 7.4.194  pgp_sort_keys   133
+                 7.4.195  pgp_strict_enc   134
+                 7.4.196  pgp_timeout   134
+                 7.4.197  pgp_use_gpg_agent   134
+                 7.4.198  pgp_verify_command   134
+                 7.4.199  pgp_verify_key_command   134
+                 7.4.200  pipe_decode   134
+                 7.4.201  pipe_sep   135
+                 7.4.202  pipe_split   135
+                 7.4.203  pop_auth_try_all   135
+                 7.4.204  pop_authenticators   135
+                 7.4.205  pop_delete   136
+                 7.4.206  pop_host   136
+                 7.4.207  pop_last   136
+                 7.4.208  pop_mail_check   136
+                 7.4.209  pop_pass   137
+                 7.4.210  pop_reconnect   137
+                 7.4.211  pop_user   137
+                 7.4.212  post_indent_string   137
+                 7.4.213  postpone   137
+                 7.4.214  postponed   138
+                 7.4.215  preconnect   138
+                 7.4.216  print   138
+                 7.4.217  print_command   138
+                 7.4.218  print_decode   138
+                 7.4.219  print_split   139
+                 7.4.220  prompt_after   139
+                 7.4.221  query_command   139
+                 7.4.222  quit   139
 
                                              vii
 
-                 6.4.233  reply_to   140
-                 6.4.234  resolve   140
-                 6.4.235  reverse_alias   140
-                 6.4.236  reverse_name   141
-                 6.4.237  reverse_realname   141
-                 6.4.238  rfc2047_parameters   141
-                 6.4.239  save_address   141
-                 6.4.240  save_empty   142
-                 6.4.241  save_name   142
-                 6.4.242  score   142
-                 6.4.243  score_threshold_delete   142
-                 6.4.244  score_threshold_flag   143
-                 6.4.245  score_threshold_read   143
-                 6.4.246  send_charset   143
-                 6.4.247  sendmail   143
-                 6.4.248  sendmail_wait   143
-                 6.4.249  shell   144
-                 6.4.250  sidebar_boundary   144
-                 6.4.251  sidebar_delim   144
-                 6.4.252  sidebar_newmail_only   144
-                 6.4.253  sidebar_number_format   144
-                 6.4.254  sidebar_shorten_hierarchy   145
-                 6.4.255  sidebar_visible   145
-                 6.4.256  sidebar_width   146
-                 6.4.257  sig_dashes   146
-                 6.4.258  sig_on_top   146
-                 6.4.259  signature   146
-                 6.4.260  signoff_string   146
-                 6.4.261  simple_search   147
-                 6.4.262  sleep_time   147
-                 6.4.263  smart_wrap   147
-                 6.4.264  smileys   147
-                 6.4.265  smime_ask_cert_label   147
-                 6.4.266  smime_ca_location   148
-                 6.4.267  smime_certificates   148
-                 6.4.268  smime_decrypt_command   148
-                 6.4.269  smime_decrypt_use_default_key   149
-                 6.4.270  smime_default_key   149
-                 6.4.271  smime_encrypt_command   149
-                 6.4.272  smime_encrypt_with   149
-                 6.4.273  smime_get_cert_command   150
-                 6.4.274  smime_get_cert_email_command   150
-                 6.4.275  smime_get_signer_cert_command   150
-                 6.4.276  smime_import_cert_command   150
-                 6.4.277  smime_is_default   150
-                 6.4.278  smime_keys   150
-                 6.4.279  smime_pk7out_command   151
-                 6.4.280  smime_sign_command   151
-                 6.4.281  smime_sign_opaque_command   151
-                 6.4.282  smime_timeout   151
-                 6.4.283  smime_verify_command   151
-                 6.4.284  smime_verify_opaque_command   152
-                 6.4.285  smtp_envelope   152
+                 7.4.223  quote_empty   140
+                 7.4.224  quote_quoted   140
+                 7.4.225  quote_regexp   140
+                 7.4.226  read_inc   140
+                 7.4.227  read_only   140
+                 7.4.228  realname   141
+                 7.4.229  recall   141
+                 7.4.230  record   141
+                 7.4.231  reply_regexp   141
+                 7.4.232  reply_self   142
+                 7.4.233  reply_to   142
+                 7.4.234  resolve   142
+                 7.4.235  reverse_alias   142
+                 7.4.236  reverse_name   143
+                 7.4.237  reverse_realname   143
+                 7.4.238  rfc2047_parameters   143
+                 7.4.239  save_address   143
+                 7.4.240  save_empty   144
+                 7.4.241  save_name   144
+                 7.4.242  score   144
+                 7.4.243  score_threshold_delete   144
+                 7.4.244  score_threshold_flag   145
+                 7.4.245  score_threshold_read   145
+                 7.4.246  send_charset   145
+                 7.4.247  sendmail   145
+                 7.4.248  sendmail_wait   145
+                 7.4.249  shell   146
+                 7.4.250  sidebar_boundary   146
+                 7.4.251  sidebar_delim   146
+                 7.4.252  sidebar_newmail_only   146
+                 7.4.253  sidebar_number_format   146
+                 7.4.254  sidebar_shorten_hierarchy   147
+                 7.4.255  sidebar_visible   147
+                 7.4.256  sidebar_width   148
+                 7.4.257  sig_dashes   148
+                 7.4.258  sig_on_top   148
+                 7.4.259  signature   148
+                 7.4.260  signoff_string   148
+                 7.4.261  simple_search   149
+                 7.4.262  sleep_time   149
+                 7.4.263  smart_wrap   149
+                 7.4.264  smileys   149
+                 7.4.265  smime_ask_cert_label   149
+                 7.4.266  smime_ca_location   150
+                 7.4.267  smime_certificates   150
+                 7.4.268  smime_decrypt_command   150
+                 7.4.269  smime_decrypt_use_default_key   151
+                 7.4.270  smime_default_key   151
+                 7.4.271  smime_encrypt_command   151
+                 7.4.272  smime_encrypt_with   151
+                 7.4.273  smime_get_cert_command   152
+                 7.4.274  smime_get_cert_email_command   152
+                 7.4.275  smime_get_signer_cert_command   152
 
                                              viii
 
-                 6.4.286  smtp_host   152
-                 6.4.287  smtp_pass   152
-                 6.4.288  smtp_port   153
-                 6.4.289  smtp_use_tls   153
-                 6.4.290  smtp_user   153
-                 6.4.291  sort   153
-                 6.4.292  sort_alias   154
-                 6.4.293  sort_aux   154
-                 6.4.294  sort_browser   155
-                 6.4.295  sort_re   155
-                 6.4.296  spam_separator   155
-                 6.4.297  spoolfile   155
-                 6.4.298  ssl_ca_certificates_file   156
-                 6.4.299  ssl_client_cert   156
-                 6.4.300  ssl_force_tls   156
-                 6.4.301  ssl_min_dh_prime_bits   156
-                 6.4.302  ssl_starttls   156
-                 6.4.303  ssl_use_sslv2   157
-                 6.4.304  ssl_use_sslv3   157
-                 6.4.305  ssl_use_tlsv1   157
-                 6.4.306  ssl_usesystemcerts   157
-                 6.4.307  status_chars   157
-                 6.4.308  status_format   158
-                 6.4.309  status_on_top   160
-                 6.4.310  strict_mailto   160
-                 6.4.311  strict_mime   160
-                 6.4.312  strict_threads   161
-                 6.4.313  strip_was   161
-                 6.4.314  strip_was_regex   161
-                 6.4.315  stuff_quoted   161
-                 6.4.316  suspend   162
-                 6.4.317  text_flowed   162
-                 6.4.318  thorough_search   162
-                 6.4.319  thread_received   162
-                 6.4.320  tilde   162
-                 6.4.321  timeout   163
-                 6.4.322  tmpdir   163
-                 6.4.323  to_chars   163
-                 6.4.324  trash   163
-                 6.4.325  tunnel   163
-                 6.4.326  umask   164
-                 6.4.327  uncollapse_jump   164
-                 6.4.328  use_8bitmime   164
-                 6.4.329  use_domain   164
-                 6.4.330  use_from   164
-                 6.4.331  use_idn   165
-                 6.4.332  use_ipv6   165
-                 6.4.333  user_agent   165
-                 6.4.334  visual   165
-                 6.4.335  wait_key   165
-                 6.4.336  weed   166
-                 6.4.337  wrap_search   166
-                 6.4.338  wrapmargin   166
+                 7.4.276  smime_import_cert_command   152
+                 7.4.277  smime_is_default   152
+                 7.4.278  smime_keys   152
+                 7.4.279  smime_pk7out_command   153
+                 7.4.280  smime_sign_command   153
+                 7.4.281  smime_sign_opaque_command   153
+                 7.4.282  smime_timeout   153
+                 7.4.283  smime_verify_command   153
+                 7.4.284  smime_verify_opaque_command   154
+                 7.4.285  smtp_envelope   154
+                 7.4.286  smtp_host   154
+                 7.4.287  smtp_pass   154
+                 7.4.288  smtp_port   155
+                 7.4.289  smtp_use_tls   155
+                 7.4.290  smtp_user   155
+                 7.4.291  sort   155
+                 7.4.292  sort_alias   156
+                 7.4.293  sort_aux   156
+                 7.4.294  sort_browser   157
+                 7.4.295  sort_re   157
+                 7.4.296  spam_separator   157
+                 7.4.297  spoolfile   157
+                 7.4.298  ssl_ca_certificates_file   158
+                 7.4.299  ssl_client_cert   158
+                 7.4.300  ssl_force_tls   158
+                 7.4.301  ssl_min_dh_prime_bits   158
+                 7.4.302  ssl_starttls   158
+                 7.4.303  ssl_use_sslv2   159
+                 7.4.304  ssl_use_sslv3   159
+                 7.4.305  ssl_use_tlsv1   159
+                 7.4.306  ssl_usesystemcerts   159
+                 7.4.307  status_chars   159
+                 7.4.308  status_format   160
+                 7.4.309  status_on_top   162
+                 7.4.310  strict_mailto   162
+                 7.4.311  strict_mime   162
+                 7.4.312  strict_threads   163
+                 7.4.313  strip_was   163
+                 7.4.314  strip_was_regex   163
+                 7.4.315  stuff_quoted   163
+                 7.4.316  suspend   164
+                 7.4.317  text_flowed   164
+                 7.4.318  thorough_search   164
+                 7.4.319  thread_received   164
+                 7.4.320  tilde   164
+                 7.4.321  timeout   165
+                 7.4.322  tmpdir   165
+                 7.4.323  to_chars   165
+                 7.4.324  trash   165
+                 7.4.325  tunnel   165
+                 7.4.326  umask   166
+                 7.4.327  uncollapse_jump   166
+                 7.4.328  use_8bitmime   166
 
                                               ix
 
-                 6.4.339  write_bcc   166
-                 6.4.340  write_inc   166
-                 6.4.341  xterm_icon   167
-                 6.4.342  xterm_leave   167
-                 6.4.343  xterm_set_titles   167
-                 6.4.344  xterm_title   167
-           6.5   Functions ....................................................... 168
-                 6.5.1    generic   168
-                 6.5.2    index   168
-                 6.5.3    pager   170
-                 6.5.4    alias   172
-                 6.5.5    query   172
-                 6.5.6    attach   172
-                 6.5.7    compose   173
-                 6.5.8    postpone   174
-                 6.5.9    browser   174
-                 6.5.10   pgp   175
-                 6.5.11   editor   175
-
-       7.  Miscellany ............................................................ 175
-           7.1   Acknowledgments ................................................. 176
-           7.2   About this document ............................................. 178
+                 7.4.329  use_domain   166
+                 7.4.330  use_from   166
+                 7.4.331  use_idn   167
+                 7.4.332  use_ipv6   167
+                 7.4.333  user_agent   167
+                 7.4.334  visual   167
+                 7.4.335  wait_key   167
+                 7.4.336  weed   168
+                 7.4.337  wrap_search   168
+                 7.4.338  wrapmargin   168
+                 7.4.339  write_bcc   168
+                 7.4.340  write_inc   168
+                 7.4.341  xterm_icon   169
+                 7.4.342  xterm_leave   169
+                 7.4.343  xterm_set_titles   169
+                 7.4.344  xterm_title   169
+           7.5   Functions ....................................................... 170
+                 7.5.1    generic   170
+                 7.5.2    index   170
+                 7.5.3    pager   172
+                 7.5.4    alias   174
+                 7.5.5    query   174
+                 7.5.6    attach   174
+                 7.5.7    compose   175
+                 7.5.8    postpone   176
+                 7.5.9    browser   176
+                 7.5.10   pgp   177
+                 7.5.11   editor   177
+
+       8.  Miscellany ............................................................ 177
+           8.1   Acknowledgments ................................................. 178
+           8.2   About this document ............................................. 180
 
                                               x
 
-- 
2.20.1