From f7a7cee0f8bce7ddc378197a9394c6fceb6988ec Mon Sep 17 00:00:00 2001
From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Sat, 13 Aug 2005 13:36:01 +0000
Subject: [PATCH] Rocco Rutte: - improve libESMTP integration: allow for
 different envelope sender via $smtp_envelope - improve libESMTP integration:
 add DSN support - improve libESMTP integration: add 8BITMIME flag support

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@395 e385b8ad-14ed-0310-8656-cc95a2468c6d
---
 ChangeLog            |    2 +
 UPGRADING            |    2 +
 doc/manual.sgml.head |   48 +-
 doc/manual.txt       | 1786 +++++++++++++++++++++---------------------
 init.h               |   28 +-
 mutt_libesmtp.c      |   64 +-
 6 files changed, 1037 insertions(+), 893 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f401e2..73e3d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Changes specific to mutt-ng:
 
 2005-08-13:
+  * libESMTP integration has been improved: it now features DSN, the
+    8BITMIME flag and an envelope sender differend from From: header
   * Merged in latest mutt changes up to 1.5.10
 
 2005-08-11:
diff --git a/UPGRADING b/UPGRADING
index c1e88ab..b93493a 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -12,6 +12,8 @@ sources of information.
 
 2005-08-13:
 
+  The $smtp_envelope option has been added.
+
   To improve consistency, the following variables were renamed and
   synonyms kept: $smtp_auth_username to $smtp_user and
   $smtp_auth_password to $smtp_pass.
diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index da82317..8f975aa 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -3269,21 +3269,37 @@ current message into a whole different thread.
 
 <!--}}}--> 
 
-<sect>Delivery Status Notification (DSN) Support <!--{{{--> 
+<sect>Delivery Status Notification (DSN) Support<label id="dsn"> <!--{{{--> 
 <p>
 
 RFC1894 defines a set of MIME content types for relaying information
 about the status of electronic mail messages.  These can be thought of as
-``return receipts.'' Berkeley sendmail 8.8.x currently has some command
-line options in which the mail client can make requests as to what type
-of status messages should be returned.
+``return receipts.''
 
-To support this, there are two variables. <ref id="dsn_notify"
-name="&dollar;dsn&lowbar;notify"> is used to request receipts for
-different results (such as failed message, message delivered, etc.).
-<ref id="dsn_return" name="&dollar;dsn&lowbar;return"> requests how much
-of your message should be returned with the receipt (headers or full
-message).  Refer to the man page on sendmail for more details on DSN.
+Users can make use of it in one of the following two ways:
+
+<itemize>
+  <item>Berkeley sendmail 8.8.x currently has some command line options
+    in which the mail client can make requests as to what type of status
+    messages should be returned.
+  <item>The SMTP support via libESMTP supports it, too.
+</itemize>
+
+To support this, there are two variables:
+
+<itemize>
+
+  <item><ref id="dsn_notify" name="&dollar;dsn&lowbar;notify"> is used
+    to request receipts for different results (such as failed message,
+    message delivered, etc.).
+
+  <item><ref id="dsn_return" name="&dollar;dsn&lowbar;return"> requests
+    how much of your message should be returned with the receipt
+    (headers or full message).
+
+</itemize>
+
+Please see the reference chapter for possible values.
 
 <!--}}}--> 
 
@@ -3517,7 +3533,11 @@ score !~* =42
 <p>Mutt-ng can be built using a library called ``libESMTP'' which
 provides SMTP functionality. When <tt/configure/ was called with
 <tt/--with-libesmtp/ or the output <tt>muttng -v</tt> contains
-<tt>+USE_LIBESMTP</tt>, this will be or is the case already.
+<tt>+USE_LIBESMTP</tt>, this will be or is the case already. The SMTP
+support includes support for Delivery Status Notification (see <ref
+id="dsn" name="Delivery Status Notification"> section) as well as
+handling the <tt/8BITMIME/ flag controlled via <ref id="use_8bitmime"
+name="&dollar;use&lowbar;8bitmime">.
 
 <p>To enable sending mail directly via SMTP without an MTA such as
 Postfix or SSMTP and the like, simply set the <ref id="smtp_host"
@@ -3536,6 +3556,12 @@ 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.
 
+<p>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 <tt/From:/ header. In this case, the variable
+<ref id="smtp_envelope" name="&dollar;smtp&lowbar;envelope"> may be used
+to set the envelope different from the <tt/From:/ header.
+
 <!-- }}} -->
 
 <sect>Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)<label id="account-hook"> <!--{{{--> 
diff --git a/doc/manual.txt b/doc/manual.txt
index 2482bb2..457beac 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-r394
+                                     version devel-r392
 
                                           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.322  , page 159) variable.
+       can be customized with the _$_t_o___c_h_a_r_s (section 6.4.323  , page 160) 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.290  , page 149) by _t_h_r_e_a_d_s, there are
+       When the mailbox is _s_o_r_t_e_d (section 6.4.291  , page 150) 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 105).  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 105) to optionally display the number of
+       tion 6.4.110  , page 106).  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 106) 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.311  , page 157).
+       See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 6.4.312  , page 158).
 
        _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 80) variable for
-       future use. NNoottee:: Specifying an _$_a_l_i_a_s___f_i_l_e (section 6.4.3  , page 80) does not
+       the file specified by the _$_a_l_i_a_s___f_i_l_e (section 6.4.3  , page 81) variable for
+       future use. NNoottee:: Specifying an _$_a_l_i_a_s___f_i_l_e (section 6.4.3  , page 81) 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 100) configuration variable is set.
+       _$_h_o_n_o_r___f_o_l_l_o_w_u_p___t_o (section 6.4.88  , page 101) 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 129), _$_p_i_p_e___s_p_l_i_t
-       (section 6.4.202  , page 129), _$_p_i_p_e___s_e_p (section 6.4.201  , page 129) and
-       _$_w_a_i_t___k_e_y (section 6.4.334  , page 161) control the exact behavior of this
+       it.  The variables _$_p_i_p_e___d_e_c_o_d_e (section 6.4.200  , page 130), _$_p_i_p_e___s_p_l_i_t
+       (section 6.4.202  , page 130), _$_p_i_p_e___s_e_p (section 6.4.201  , page 130) and
+       _$_w_a_i_t___k_e_y (section 6.4.335  , page 162) 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.335  , page 162) variable.
+       the value of the _$_w_e_e_d (section 6.4.336  , page 163) 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.334  , page 161) can be used to control whether Mutt-ng will wait for a key
+       6.4.335  , page 162) 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 134) variable to
+       The _p_a_g_e_r uses the _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225  , page 135) 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.307  , page 154) will change to a
+       folder. The %r in _$_s_t_a_t_u_s___f_o_r_m_a_t (section 6.4.308  , page 155) 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 92).
+       Also see _e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 93).
 
        _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 127) permanently.
+       _$_p_g_p___s_i_g_n___a_s (section 6.4.192  , page 128) 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 124)) have obvious meanings.  But some explana-
+       _m_a_t (section 6.4.179  , page 125)) 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:
@@ -948,7 +948,7 @@
 
        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 113)).  Most important is the ``middleman'' capability, indicated by a
+       page 114)).  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 132) variable.  This means that you can
+       the _$_p_o_s_t_p_o_n_e_d (section 6.4.214  , page 133) 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 132) quad-option.
+       See also the _$_p_o_s_t_p_o_n_e (section 6.4.213  , page 133) quad-option.
 
        _3_.  _C_o_n_f_i_g_u_r_a_t_i_o_n
 
@@ -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 78) to configure Mutt-ng.
+       your _c_o_m_m_a_n_d_s (section 6.3  , page 79) 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
-       78).  Each line of the file may contain one or more commands.  When multiple
+       79).  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 78).
+       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).
 
        _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 80)
+       only one file, the one pointed to by the _$_a_l_i_a_s___f_i_l_e (section 6.4.3  , page 81)
        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 92) variable set.
+       (section 6.4.54  , page 93) 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 164).  The special
+       list of functions, see the _r_e_f_e_r_e_n_c_e (section 6.5  , page 165).  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.296  , page
-       151) 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 6.4.297  , page
+       152) 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 164).
+       6.5  , page 165).
 
        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 134) in the
+          +o quoted (text matching _$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225  , page 135) 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 136).)
+       _$_r_e_p_l_y___t_o (section 6.4.233  , page 137).)
 
        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 95)
+       lowup-To header is controlled by the _$_f_o_l_l_o_w_u_p___t_o (section 6.4.66  , page 96)
        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 94) and _$_s_p_o_o_l_f_i_l_e (section
-       6.4.296  , page 151)) should be executed before the mailboxes command.
+       acters (like _$_f_o_l_d_e_r (section 6.4.64  , page 95) and _$_s_p_o_o_l_f_i_l_e (section
+       6.4.297  , page 152)) 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 92) variable, or use the _e_d_i_t_-
+       set the _e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 93) 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.
 
@@ -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 84), _$_s_i_g_n_a_t_u_r_e (section 6.4.259  , page 143) and
-       _$_l_o_c_a_l_e (section 6.4.114  , page 108) variables in order to change the language
+       _t_i_o_n (section 6.4.15  , page 85), _$_s_i_g_n_a_t_u_r_e (section 6.4.259  , page 143) and
+       _$_l_o_c_a_l_e (section 6.4.114  , page 109) 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 164).  ``exec function'' is equivalent
+       _f_u_n_c_t_i_o_n _r_e_f_e_r_e_n_c_e (section 6.5  , page 165).  ``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 139), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.245  , page 139),
-       _$_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 139) 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 139) 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 139) are set to -1, which means that in the default
+       tion 6.4.244  , page 140), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 6.4.245  , page 140),
+       _$_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 140) 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 140) 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 140) 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 105) variable.
+       the %H selector in the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106) variable.
        (Tip: try %?H?[%H] ?  to display spam tags only when they are defined for a
        given message.)
 
@@ -2050,7 +2050,7 @@
        Usage: reset _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
 
        This command is used to set (and unset) _c_o_n_f_i_g_u_r_a_t_i_o_n _v_a_r_i_a_b_l_e_s (section 6.4  ,
-       page 80).  There are four basic types of variables: boolean, number, string and
+       page 81).  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,7 +2196,7 @@
 
        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 103),
+       test for the availability of _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 6.4.99  , page 104),
        use:
 
             ifdef imap_mail_check 'set imap_mail_check = 300'
@@ -2498,7 +2498,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.307  , page 154) variable. For the hostname and version
+       _m_a_t (section 6.4.308  , page 155) 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:
 
@@ -2629,7 +2629,7 @@
        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 84) variable is set, the next operation applies to the tagged messages
+       page 85) 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,
@@ -2699,8 +2699,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 90) 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 90) that is in
+       6.4.45  , page 91) 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 91) 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
@@ -2798,7 +2798,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 111)
+       uses the default specified with the _$_m_b_o_x___t_y_p_e (section 6.4.125  , page 112)
        variable.
 
        mmbbooxx.  This is the most widely used mailbox format for UNIX.  All messages are
@@ -2835,10 +2835,10 @@
        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.296  , page 151) (incoming)
+          +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 6.4.297  , page 152) (incoming)
             mailbox
 
-          +o > -- refers to your _$_m_b_o_x (section 6.4.124  , page 110) file
+          +o > -- refers to your _$_m_b_o_x (section 6.4.124  , page 111) file
 
           +o < -- refers to your _$_r_e_c_o_r_d (section 6.4.230  , page 136) file
 
@@ -2848,7 +2848,7 @@
 
           +o ~ -- refers to your home directory
 
-          +o = or + -- refers to your _$_f_o_l_d_e_r (section 6.4.64  , page 94) directory
+          +o = or + -- refers to your _$_f_o_l_d_e_r (section 6.4.64  , page 95) 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
@@ -2866,7 +2866,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 105) variable, the escape
+       box.  In the _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106) variable, the escape
        ``%L'' will return the string ``To <list>'' when ``list'' appears in the ``To''
 
        The Mutt Next Generation E-Mail Client                                       58
@@ -2884,7 +2884,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 95) option is set, mutt will
+       and if the _$_f_o_l_l_o_w_u_p___t_o (section 6.4.66  , page 96) 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
@@ -2894,7 +2894,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 100) configuration variable is set.  Using list-reply
+       (section 6.4.88  , page 101) 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.
 
@@ -2907,7 +2907,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 136) variable to help decide which address to use.  If set to
+       6.4.233  , page 137) 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
@@ -2915,13 +2915,13 @@
 
        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 105) variable's ``%y'' and ``%Y''
+       _$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106) variable's ``%y'' and ``%Y''
        escapes can be used to expand ``X-Label:'' fields in the index, and Mutt-ng's
        pattern-matcher can match regular expressions to ``X-Label:'' fields with the
        ``~y'' selector.  ``X-Label:'' is not a standard message header field, but it
        can easily be inserted by procmail and other mail filtering agents.
 
-       Lastly, Mutt-ng has the ability to _s_o_r_t (section 6.4.290  , page 149) the mail-
+       Lastly, Mutt-ng has the ability to _s_o_r_t (section 6.4.291  , page 150) 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
@@ -2963,22 +2963,31 @@
 
        RFC1894 defines a set of MIME content types for relaying information about the
        status of electronic mail messages.  These can be thought of as ``return
-       receipts.'' Berkeley sendmail 8.8.x currently has some command line options in
-       which the mail client can make requests as to what type of status messages
-       should be returned.
+       receipts.''
 
-       To support this, there are two variables. _$_d_s_n___n_o_t_i_f_y (section 6.4.51  , page
-       91) is used to request receipts for different results (such as failed message,
-       message delivered, etc.).  _$_d_s_n___r_e_t_u_r_n (section 6.4.52  , page 92) requests how
-       much of your message should be returned with the receipt (headers or full mes-
-       sage).  Refer to the man page on sendmail for more details on DSN.
+       Users can make use of it in one of the following two ways:
 
-       _4_._1_3  _P_O_P_3 _S_u_p_p_o_r_t _(_O_P_T_I_O_N_A_L_)
+          +o Berkeley sendmail 8.8.x currently has some command line options in which
+            the mail client can make requests as to what type of status messages
+            should be returned.
 
-       If Mutt-ng was compiled with POP3 support (by running the _c_o_n_f_i_g_u_r_e script with
+          +o The SMTP support via libESMTP supports it, too.
+
+       To support this, there are two variables:
+
+          +o _$_d_s_n___n_o_t_i_f_y (section 6.4.51  , page 92) is used to request receipts for
+            different results (such as failed message, message delivered, etc.).
 
        The Mutt Next Generation E-Mail Client                                       60
 
+          +o _$_d_s_n___r_e_t_u_r_n (section 6.4.52  , page 93) requests how much of your message
+            should be returned with the receipt (headers or full message).
+
+       Please see the reference chapter for possible values.
+
+       _4_._1_3  _P_O_P_3 _S_u_p_p_o_r_t _(_O_P_T_I_O_N_A_L_)
+
+       If Mutt-ng was compiled with POP3 support (by running the _c_o_n_f_i_g_u_r_e script with
        the _-_-_e_n_a_b_l_e_-_p_o_p flag), it has the ability to work with mailboxes located on a
        remote POP3 server and fetch mail for local browsing.
 
@@ -2993,7 +3002,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 131) variable, which defaults
+       by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 6.4.208  , page 132) 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
@@ -3003,8 +3012,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 130), fetch all your
-       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 6.4.296  , page 151).
+       It allows to connect to _p_o_p___h_o_s_t (section 6.4.206  , page 131), 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 152).
        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-
@@ -3021,6 +3030,9 @@
        INBOX is the special name for your spool mailbox on the IMAP server. If you
        want to access another mail folder at the IMAP server, you should use
        imap://imapserver/path/to/folder where path/to/folder is the path of the folder
+
+       The Mutt Next Generation E-Mail Client                                       61
+
        you want to access.
 
        You can select an alternative port by specifying it with the server, i.e.:
@@ -3030,12 +3042,9 @@
        name@imapserver[:port]/INBOX.
 
        If Mutt-ng was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script with
-       the _-_-_w_i_t_h_-_s_s_l flag), connections to IMAP servers can be encrypted. This
-
-       The Mutt Next Generation E-Mail Client                                       61
-
-       naturally requires that the server supports SSL encrypted connections. To
-       access a folder with IMAP/SSL, you should use imaps://[user-
+       the _-_-_w_i_t_h_-_s_s_l flag), connections to IMAP servers can be encrypted. This natu-
+       rally requires that the server supports SSL encrypted connections. To access a
+       folder with IMAP/SSL, you should use imaps://[user-
        name@]imapserver[:port]/path/to/folder as your folder path.
 
        Pine-compatible notation is also supported, i.e.  {[user-
@@ -3047,12 +3056,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 102) vari-
+       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 103) 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 103) and
-       _$_t_i_m_e_o_u_t (section 6.4.320  , page 159) variables.
+       want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 6.4.99  , page 104) and
+       _$_t_i_m_e_o_u_t (section 6.4.321  , page 160) 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
@@ -3078,6 +3087,8 @@
             respectively). You may also subscribe and unsubscribe to mailboxes (nor-
             mally these are bound to s and u, respectively).
 
+       The Mutt Next Generation E-Mail Client                                       62
+
        _4_._1_4_._2  _A_u_t_h_e_n_t_i_c_a_t_i_o_n
 
        Mutt-ng supports four authentication methods with IMAP servers: SASL, GSSAPI,
@@ -3088,9 +3099,6 @@
        To use ANONYMOUS, simply make your username blank or "anonymous".
 
        SASL is a special super-authenticator, which selects among several protocols
-
-       The Mutt Next Generation E-Mail Client                                       62
-
        (including GSSAPI, CRAM-MD5, ANONYMOUS, and DIGEST-MD5) the most secure method
        available on your host and the server. Using some of these methods (including
        DIGEST-MD5 and possibly GSSAPI), your entire session will be encrypted and
@@ -3103,15 +3111,15 @@
 
        There are a few variables which control authentication:
 
-          +o _$_i_m_a_p___u_s_e_r (section 6.4.105  , page 104) - controls the username under
+          +o _$_i_m_a_p___u_s_e_r (section 6.4.105  , page 105) - 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 103) - a password which you may pre-
+          +o _$_i_m_a_p___p_a_s_s (section 6.4.100  , page 104) - 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 101) - a colon-delimited list
+          +o _$_i_m_a_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s (section 6.4.91  , page 102) - 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).
@@ -3133,6 +3141,9 @@
 
        Especially for Usenet, people often ask for advanced filtering and scoring
        functionality. Of course, mutt-ng has scoring and allows a killfile, too. How
+
+       The Mutt Next Generation E-Mail Client                                       63
+
        to use a killfile has been discussed in _M_e_s_s_a_g_e _s_c_o_r_i_n_g (section 3.25  , page
        38).
 
@@ -3143,8 +3154,6 @@
 
        In mutt-ng this is as easy as
 
-       The Mutt Next Generation E-Mail Client                                       63
-
             score ~* =42
 
        This tells mutt-ng to apply a score of 42 to all messages whose sender speci-
@@ -3170,29 +3179,36 @@
 
        Mutt-ng can be built using a library called ``libESMTP'' which provides SMTP
        functionality. When configure was called with --with-libesmtp or the output
-       muttng -v contains +USE_LIBESMTP, this will be or is the case already.
+       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 58) 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 161).
 
        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.285  , page 148)
+       SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 6.4.286  , page 149)
        variable pointing to your SMTP server.
 
-       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 6.4.289  ,
-       page 149) and _$_s_m_t_p___p_a_s_s (section 6.4.286  , page 148) variables.
+       The Mutt Next Generation E-Mail Client                                       64
+
+       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 6.4.290  ,
+       page 150) and _$_s_m_t_p___p_a_s_s (section 6.4.287  , page 149) 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.288  , page 149) variable must be either set to
+       _$_s_m_t_p___u_s_e___t_l_s (section 6.4.289  , page 150) 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 149) 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_)
 
        If you happen to have accounts on multiple IMAP and/or POP servers, you may
        find managing all the authentication settings inconvenient and error-prone.
-
-       The Mutt Next Generation E-Mail Client                                       64
-
        The account-hook command may help. This hook works like folder-hook but is
        invoked whenever you access a remote mailbox (including inside the folder
        browser), not just when you open the mailbox.
@@ -3221,6 +3237,8 @@
        an arbitrary format, provided that the user has a script to convert from/to
        this format to one of the accepted.
 
+       The Mutt Next Generation E-Mail Client                                       65
+
        The most common use is to open compressed archived folders e.g. with gzip.
 
        In addition, the user can provide a script that gets a folder in an accepted
@@ -3239,8 +3257,6 @@
             close-hook \\.gz$ "gzip -c %t > %f"
             append-hook \\.gz$ "gzip -c %t >> %f"
 
-       The Mutt Next Generation E-Mail Client                                       65
-
        You do not have to specify all of the commands. If you omit _a_p_p_e_n_d_-_h_o_o_k (sec-
        tion 4.19.3  , page 65), the folder will be open and closed again each time you
        will add to it. If you omit _c_l_o_s_e_-_h_o_o_k (section 4.19.2  , page 65) (or give
@@ -3252,7 +3268,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 138), so that the compressed file
+       unset _$_s_a_v_e___e_m_p_t_y (section 6.4.240  , page 139), 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
@@ -3275,6 +3291,8 @@
 
        Example:
 
+       The Mutt Next Generation E-Mail Client                                       66
+
             open-hook \\.gz$ "gzip -cd %f > %t"
 
        If the _c_o_m_m_a_n_d is empty, this operation is disabled for this file type.
@@ -3294,8 +3312,6 @@
        The _c_o_m_m_a_n_d should nnoott remove the decompressed file. The _c_o_m_m_a_n_d should return
        non-zero exit status if it fails, so mutt knows something's wrong.
 
-       The Mutt Next Generation E-Mail Client                                       66
-
        Example:
 
             close-hook \\.gz$ "gzip -c %t > %f"
@@ -3325,7 +3341,10 @@
 
        When _a_p_p_e_n_d_-_h_o_o_k (section 4.19.3  , page 65) 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 111)) type is always
+       is. Thus the default (_$_m_b_o_x___t_y_p_e (section 6.4.125  , page 112)) type is always
+
+       The Mutt Next Generation E-Mail Client                                       67
+
        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  ,
@@ -3345,8 +3364,6 @@
             open-hook  \\.pgp$ "pgp -f < %f > %t"
             close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f"
 
-       The Mutt Next Generation E-Mail Client                                       67
-
        Please note, that PGP does not support appending to an encrypted folder, so
        there is no append-hook defined.
 
@@ -3375,6 +3392,9 @@
        the message to a text representation.  Mutt-ng internally supports a number of
        MIME types, including text/plain, text/enriched, message/rfc822, and mes-
        sage/news.  In addition, the export controlled version of Mutt-ng recognizes a
+
+       The Mutt Next Generation E-Mail Client                                       68
+
        variety of PGP MIME types, including PGP/MIME and application/pgp.
 
        Mutt-ng will denote attachments with a couple lines describing them.  These
@@ -3394,9 +3414,6 @@
 
        The default binding for view-attachments is `v', which displays the attachment
        menu for a message.  The attachment menu displays a list of the attachments in
-
-       The Mutt Next Generation E-Mail Client                                       68
-
        a message.  From the attachment menu, you can save, print, pipe, delete, and
        view attachments.  You can apply these operations to a group of attachments at
        once, by tagging the attachments and by using the ``tag-prefix'' operator.  You
@@ -3429,6 +3446,9 @@
        or canceling) the message.  It can be toggled with the toggle-unlink command
        (default: u).  The next field is the MIME content-type, and can be changed with
        the edit-type command (default: ^T).  The next field is the encoding for the
+
+       The Mutt Next Generation E-Mail Client                                       69
+
        attachment, which allows a binary message to be encoded for transmission on
        7bit links.  It can be changed with the edit-encoding command (default: ^E).
        The next field is the size of the attachment, rounded to kilobytes or
@@ -3449,8 +3469,6 @@
             application/pgp                 pgp
             audio/x-aiff                    aif aifc aiff
 
-       The Mutt Next Generation E-Mail Client                                       69
-
        A sample mime.types file comes with the Mutt-ng distribution, and should con-
        tain most of the MIME types you are likely to use.
 
@@ -3480,6 +3498,9 @@
 
        In order to handle various MIME types that Mutt-ng can not handle internally,
        Mutt-ng parses a series of external configuration files to find an external
+
+       The Mutt Next Generation E-Mail Client                                       70
+
        handler.  The default search string for these files is a colon delimited list
        set to
 
@@ -3503,8 +3524,6 @@
        optional fields.  Each field of a definition line is divided by a semicolon ';'
        character.
 
-       The Mutt Next Generation E-Mail Client                                       70
-
        The content type is specified in the MIME standard type/subtype method.  For
        example, text/plain, text/html, image/gif, etc.  In addition, the mailcap for-
        mat includes two formats for wildcards, one using the special '*' subtype, the
@@ -3534,6 +3553,8 @@
 
             text/html; lynx %s
 
+       The Mutt Next Generation E-Mail Client                                       71
+
        In this case, lynx does not support viewing a file from stdin, so you must use
        the %s syntax.  NNoottee:: _S_o_m_e _o_l_d_e_r _v_e_r_s_i_o_n_s _o_f _l_y_n_x _c_o_n_t_a_i_n _a _b_u_g _w_h_e_r_e _t_h_e_y _w_i_l_l
        _c_h_e_c_k _t_h_e _m_a_i_l_c_a_p _f_i_l_e _f_o_r _a _v_i_e_w_e_r _f_o_r _t_e_x_t_/_h_t_m_l_.  _T_h_e_y _w_i_l_l _f_i_n_d _t_h_e _l_i_n_e
@@ -3553,14 +3574,12 @@
 
        This is the simplest form of a mailcap file.
 
-       The Mutt Next Generation E-Mail Client                                       71
-
        _5_._3_._2  _S_e_c_u_r_e _u_s_e _o_f _m_a_i_l_c_a_p
 
        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 109) variable.
+       them, see the _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e (section 6.4.117  , page 110) 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.
@@ -3586,6 +3605,8 @@
 
        _5_._3_._3_._1  _O_p_t_i_o_n_a_l _F_i_e_l_d_s
 
+       The Mutt Next Generation E-Mail Client                                       72
+
        In addition to the required content-type and view command fields, you can add
        semi-colon ';' separated fields to set flags and other options.  Mutt-ng recog-
        nizes the following optional fields:
@@ -3605,18 +3626,15 @@
                    and Mutt-ng will use your standard pager to display the results.
 
              needsterminal
-                   Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w
-
-       The Mutt Next Generation E-Mail Client                                       72
-
-                   (section 5.4  , page 74), in order to decide whether it should
-                   honor the setting of the _$_w_a_i_t___k_e_y (section 6.4.334  , page 161)
-                   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.334  , page 161) 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.
+                   Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w (sec-
+                   tion 5.4  , page 74), in order to decide whether it should honor
+                   the setting of the _$_w_a_i_t___k_e_y (section 6.4.335  , page 162) 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 162) 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.
 
              compose=<command>
                    This flag specifies the command to use to create a new attachment
@@ -3641,6 +3659,8 @@
                    it to compose new attachments.  Mutt-ng will default to the defined
                    editor for text attachments.
 
+       The Mutt Next Generation E-Mail Client                                       73
+
              nametemplate=<template>
                    This field specifies the format for the file denoted by %s in the
                    command fields.  Certain programs will require a certain file
@@ -3663,8 +3683,6 @@
                         text/html; netscape -remote 'openURL(%s)' ; test=RunningX
                         text/html; lynx %s
 
-       The Mutt Next Generation E-Mail Client                                       73
-
                    In this example, Mutt-ng will run the program RunningX which will
                    return 0 if the X Window manager is running, and non-zero if it
                    isn't.  If RunningX returns 0, then Mutt-ng will call netscape to
@@ -3694,6 +3712,9 @@
 
             text/html;      netscape -remote 'openURL(%s)' ; test=RunningX
             text/html;      lynx %s; nametemplate=%s.html
+
+       The Mutt Next Generation E-Mail Client                                       74
+
             text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput
 
        For _A_u_t_o_v_i_e_w (section 5.4  , page 74), Mutt-ng will choose the third entry
@@ -3716,8 +3737,6 @@
                    use of this keyword causes Mutt-ng to not pass the body of the mes-
                    sage to the view/print/edit program on stdin.
 
-       The Mutt Next Generation E-Mail Client                                       74
-
              %t
                    Mutt-ng will expand %t to the text representation of the content
                    type of the message in the same form as the first parameter of the
@@ -3745,6 +3764,8 @@
 
        This mailcap file is fairly simple and standard:
 
+       The Mutt Next Generation E-Mail Client                                       75
+
             # I'm always running X :)
             video/*;        xanim %s > /dev/null
             image/*;        xv %s > /dev/null
@@ -3754,8 +3775,6 @@
 
        This mailcap file shows quite a number of examples:
 
-       The Mutt Next Generation E-Mail Client                                       75
-
             # Use xanim to view all videos   Xanim produces a header on startup,
             # send that to /dev/null so I don't see it
             video/*;        xanim %s > /dev/null
@@ -3795,8 +3814,11 @@
        _5_._4  _M_I_M_E _A_u_t_o_v_i_e_w
 
        In addition to explicitly telling Mutt-ng to view an attachment with the MIME
-       viewer defined in the mailcap file, Mutt-ng has support for automatically view-
-       ing MIME attachments while in the pager.
+       viewer defined in the mailcap file, Mutt-ng has support for automatically
+
+       The Mutt Next Generation E-Mail Client                                       76
+
+       viewing MIME attachments while in the pager.
 
        To work, you must define a viewer in the mailcap file which uses the copi-
        ousoutput option to denote that it is non-interactive.  Usually, you also use
@@ -3808,8 +3830,6 @@
 
        For instance, if you set auto_view to:
 
-       The Mutt Next Generation E-Mail Client                                       76
-
             auto_view text/html application/x-gunzip application/postscript image/gif application/x-tar-gz
 
        Mutt-ng could use the following mailcap entries to automatically view attach-
@@ -3845,6 +3865,9 @@
        _5_._6  _M_I_M_E _L_o_o_k_u_p
 
        Mutt-ng's mime_lookup list specifies a list of mime-types that should not be
+
+       The Mutt Next Generation E-Mail Client                                       77
+
        treated according to their mailcap entry.  This option is designed to deal with
        binary types such as application/octet-stream.  When an attachment's mime-type
        is listed in mime_lookup, then the extension of the filename will be compared
@@ -3856,9 +3879,6 @@
             mime_lookup application/octet-stream application/X-Lotus-Manuscript
 
        In addition, the unmime_lookup command may be used to disable this feature for
-
-       The Mutt Next Generation E-Mail Client                                       77
-
        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
@@ -3894,6 +3914,8 @@
 
        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
@@ -3906,14 +3928,14 @@
 
        mutt -s 'data set for run #2' professor@bigschool.edu < ~/run2.dat
 
-       The Mutt Next Generation E-Mail Client                                       78
-
        This command will send a message to ``professor@bigschool.edu'' with a subject
        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
 
+       The Mutt Next Generation E-Mail Client                                       79
+
             ~A              all messages
             ~b EXPR         messages which contain EXPR in the message body
             ~B EXPR         messages which contain EXPR in the whole message
@@ -3960,8 +3982,6 @@
                             address (excluded are addresses matching against
                             alternates or any alias)
 
-       The Mutt Next Generation E-Mail Client                                       79
-
        Where EXPR, USER, ID, and SUBJECT are _r_e_g_u_l_a_r _e_x_p_r_e_s_s_i_o_n_s (section 4.1  , page
        44).  Special attention has to be made when using regular expressions inside of
        patterns.  Specifically, Mutt-ng's parser for these patterns will strip one
@@ -3969,6 +3989,8 @@
        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 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
@@ -4013,8 +4035,6 @@
 
           +o _f_o_l_d_e_r_-_h_o_o_k (section 3.6  , page 26) _p_a_t_t_e_r_n _c_o_m_m_a_n_d
 
-       The Mutt Next Generation E-Mail Client                                       80
-
           +o _h_d_r___o_r_d_e_r (section 3.16  , page 35) _h_e_a_d_e_r [ _h_e_a_d_e_r ... ]
 
           +o _u_n_h_d_r___o_r_d_e_r (section 3.16  , page 35) _h_e_a_d_e_r [ _h_e_a_d_e_r ... ]
@@ -4023,6 +4043,8 @@
 
           +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
+
           +o _u_n_i_g_n_o_r_e (section 3.9  , page 30) _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ]
 
           +o _l_i_s_t_s (section 3.12  , page 32) _r_e_g_e_x_p [ _r_e_g_e_x_p ... ]
@@ -4069,8 +4091,6 @@
 
           +o _s_e_t (section 3.27  , page 41) [no|inv]_v_a_r_i_a_b_l_e[=_v_a_l_u_e] [ _v_a_r_i_a_b_l_e ... ]
 
-       The Mutt Next Generation E-Mail Client                                       81
-
           +o _u_n_s_e_t (section 3.27  , page 41) _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ]
 
           +o _s_o_u_r_c_e (section 3.28  , page 42) _f_i_l_e_n_a_m_e
@@ -4079,6 +4099,8 @@
 
           +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
+
           +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 ... ]
 
           +o _u_n_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 ... ]
@@ -4125,8 +4147,6 @@
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                       82
-
        Default: '%4n %2f %t %-10a   %r'
 
        Specifies the format of the data displayed for the ``alias'' menu. The follow-
@@ -4135,6 +4155,8 @@
              %a
                    alias name
 
+       The Mutt Next Generation E-Mail Client                                       83
+
              %f
                    flags - currently, a 'd' for an alias marked for deletion
 
@@ -4180,8 +4202,6 @@
        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.
 
-       The Mutt Next Generation E-Mail Client                                       83
-
        _6_._4_._8  _a_s_c_i_i___c_h_a_r_s
 
        Type: boolean
@@ -4191,6 +4211,8 @@
        If _s_e_t, Mutt-ng will use plain ASCII characters when displaying thread and
        attachment trees, instead of the default ACS characters.
 
+       The Mutt Next Generation E-Mail Client                                       84
+
        _6_._4_._9  _a_s_k_b_c_c
 
        Type: boolean
@@ -4226,7 +4248,7 @@
        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.310  , page 156) is unset.
+       is valid only if _$_s_t_r_i_c_t___m_i_m_e (section 6.4.311  , page 158) is unset.
 
        _6_._4_._1_2  _a_t_t_a_c_h___f_o_r_m_a_t
 
@@ -4237,8 +4259,6 @@
        This variable describes the format of the ``attachment'' menu.  The following
        printf(3)-style sequences are understood:
 
-       The Mutt Next Generation E-Mail Client                                       84
-
              %C
                    charset
 
@@ -4248,6 +4268,8 @@
              %D
                    deleted flag
 
+       The Mutt Next Generation E-Mail Client                                       85
+
              %d
                    description
 
@@ -4293,8 +4315,6 @@
 
        Default: '\n'
 
-       The Mutt Next Generation E-Mail Client                                       85
-
        The separator to add between attachments when operating (saving, printing, pip-
        ing, etc) on a list of tagged attachments.
 
@@ -4304,10 +4324,12 @@
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                       86
+
        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 83)'' separator is added after each attachment. When _s_e_t, Mutt-ng will
+       page 84)'' 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
@@ -4318,7 +4340,7 @@
 
        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 105)''.
+       on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106)''.
 
        _6_._4_._1_6  _a_u_t_o___t_a_g
 
@@ -4337,12 +4359,12 @@
 
        Default: no
 
-       When _s_e_t along with ``_$_e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 92)'', Mutt-ng will
+       When _s_e_t along with ``_$_e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 93)'', 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 93)''.
+       Also see ``_$_f_a_s_t___r_e_p_l_y (section 6.4.60  , page 94)''.
 
        _6_._4_._1_8  _b_e_e_p
 
@@ -4350,8 +4372,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                       86
-
        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
@@ -4360,9 +4380,11 @@
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                       87
+
        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 84)'' variable.
+       tion 6.4.18  , page 85)'' variable.
 
        _6_._4_._2_0  _b_o_u_n_c_e
 
@@ -4406,9 +4428,6 @@
 
        This variable specifies the file where the certificates you trust are saved.
        When an unknown certificate is encountered, you are asked if you accept it or
-
-       The Mutt Next Generation E-Mail Client                                       87
-
        not. If you accept it, the certificate can also be saved in this file and fur-
        ther connections are automatically accepted.
 
@@ -4418,6 +4437,8 @@
 
        Example: set certificate_file=~/.muttng/certificates
 
+       The Mutt Next Generation E-Mail Client                                       88
+
        _6_._4_._2_4  _c_h_a_r_s_e_t
 
        Type: string
@@ -4456,14 +4477,12 @@
        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.307  , page 154)'', but has
+       string is similar to ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 6.4.308  , page 155)'', but has
        its own set of printf(3)-like sequences:
 
              %a
                    total number of attachments
 
-       The Mutt Next Generation E-Mail Client                                       88
-
              %h
                    local hostname
 
@@ -4473,9 +4492,12 @@
              %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.307  , page 154)''
+       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 6.4.308  , page 155)''
+
+       The Mutt Next Generation E-Mail Client                                       89
+
        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 86)''.
+       page 87)''.
 
        _6_._4_._2_8  _c_o_n_f_i_g___c_h_a_r_s_e_t
 
@@ -4519,8 +4541,6 @@
 
        Default: 'text/plain'
 
-       The Mutt Next Generation E-Mail Client                                       89
-
        Sets the default Content-Type: header field for the body of newly composed mes-
        sages.
 
@@ -4530,10 +4550,12 @@
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                       90
+
        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
-       136)'', ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 138)'', ``_$_f_o_r_c_e___n_a_m_e (section
-       6.4.68  , page 96)'' and ``_f_c_c_-_h_o_o_k (section 3.18  , page 35)''.
+       136)'', ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 139)'', ``_$_f_o_r_c_e___n_a_m_e (section
+       6.4.68  , page 97)'' 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
 
@@ -4557,9 +4579,9 @@
 
        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 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38  , page 89)'',
-       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36  , page 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       6.4.39  , page 89)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277  , page 147)''.
+       6.4.34  , page 89)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38  , page 90)'',
+       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36  , page 89)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
+       6.4.39  , page 90)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277  , page 147)''.
 
        _6_._4_._3_6  _c_r_y_p_t___a_u_t_o_s_i_g_n
 
@@ -4574,8 +4596,6 @@
        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                                       90
-
        _6_._4_._3_7  _c_r_y_p_t___a_u_t_o_s_m_i_m_e
 
        Type: boolean
@@ -4584,9 +4604,12 @@
 
        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 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38  , page 89)'',
-       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36  , page 88)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       6.4.39  , page 89)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277  , page 147)''.
+       6.4.34  , page 89)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 6.4.38  , page 90)'',
+       ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 6.4.36  , page 89)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
+
+       The Mutt Next Generation E-Mail Client                                       91
+
+       6.4.39  , page 90)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 6.4.277  , page 147)''.
 
        _6_._4_._3_8  _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t
 
@@ -4616,9 +4639,9 @@
 
        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 89)'', because it allows you to sign all messages which are
+       6.4.38  , page 90)'', 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 89)'', that Mutt-ng is not able to
+       ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section 6.4.39  , page 90)'', 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
@@ -4630,9 +4653,6 @@
        If _s_e_t, Mutt-ng will include a time stamp in the lines surrounding PGP or
        S/MIME output, so spoofing such lines is more difficult.  If you are using col-
        ors to mark these lines, and rely on these, you may _u_n_s_e_t this setting.
-
-       The Mutt Next Generation E-Mail Client                                       91
-
        (Crypto only)
 
        _6_._4_._4_2  _c_r_y_p_t___u_s_e___g_p_g_m_e
@@ -4643,6 +4663,9 @@
 
        This variable controls the use the GPGME enabled crypto backends.  If it is _s_e_t
        and Mutt-ng was build with gpgme support, the gpgme code for S/MIME and PGP
+
+       The Mutt Next Generation E-Mail Client                                       92
+
        will be used instead of the classic code.
 
        NNoottee: You need to use this option in your .muttngrc configuration file as it
@@ -4665,12 +4688,12 @@
        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 105)''.  This is passed to strftime(3)
+       ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106)''.  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 108)''. If the first character in the string
+       ``_$_l_o_c_a_l_e (section 6.4.114  , page 109)''. 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).
 
@@ -4687,9 +4710,6 @@
        hook is declared.  The default value matches if the message is either from a
        user matching the regular expression given, or if it is from you (if the from
        address matches ``alternates'') and is to or cc'ed to a user matching the given
-
-       The Mutt Next Generation E-Mail Client                                       92
-
        regular expression.
 
        _6_._4_._4_6  _d_e_l_e_t_e
@@ -4700,6 +4720,9 @@
 
        Controls whether or not messages are really deleted when closing or synchroniz-
        ing a mailbox.  If set to _y_e_s, messages marked for deleting will automatically
+
+       The Mutt Next Generation E-Mail Client                                       93
+
        be purged without prompting.  If set to _n_o, messages marked for deletion will
        be kept in the mailbox.
 
@@ -4731,7 +4754,7 @@
 
        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 91), and the filtered message is read from the standard output.
+       page 92), 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
 
@@ -4743,22 +4766,23 @@
 
        Contains the path of the muttng_dotlock(1) binary to be used by Mutt-ng.
 
-       The Mutt Next Generation E-Mail Client                                       93
-
        _6_._4_._5_1  _d_s_n___n_o_t_i_f_y
 
        Type: string
 
        Default: ''
 
-       NNoottee:: you should not enable this unless you are using Sendmail 8.8.x or
-       greater.
+       NNoottee:: you should not enable this unless you are using Sendmail 8.8.x or greater
+       or in connection with the SMTP support via libESMTP.
 
        This variable sets the request for when notification is returned.  The string
-       consists of a comma separated list (no spaces!) of one or more of the follow-
-       ing: _n_e_v_e_r, to never request notification, _f_a_i_l_u_r_e, to request notification on
-       transmission failure, _d_e_l_a_y, to be notified of message delays, _s_u_c_c_e_s_s, to be
-       notified of successful transmission.
+       consists of a comma separated list (no spaces!) of one or more of the
+
+       The Mutt Next Generation E-Mail Client                                       94
+
+       following: _n_e_v_e_r, to never request notification, _f_a_i_l_u_r_e, to request notifica-
+       tion on transmission failure, _d_e_l_a_y, to be notified of message delays, _s_u_c_c_e_s_s,
+       to be notified of successful transmission.
 
        Example: set dsn_notify='failure,delay'
 
@@ -4768,8 +4792,8 @@
 
        Default: ''
 
-       NNoottee:: you should not enable this unless you are using Sendmail 8.8.x or
-       greater.
+       NNoottee:: you should not enable this unless you are using Sendmail 8.8.x or greater
+       or in connection with the SMTP support via libESMTP.
 
        This variable controls how much of your message is returned in DSN messages.
        It may be set to either _h_d_r_s to return just the message header, or _f_u_l_l to
@@ -4799,8 +4823,6 @@
 
        _6_._4_._5_5  _e_d_i_t_o_r
 
-       The Mutt Next Generation E-Mail Client                                       94
-
        Type: path
 
        Default: ''
@@ -4813,6 +4835,8 @@
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                       95
+
        Default: no
 
        When _s_e_t, Mutt-ng will quoted-printable encode messages when they contain the
@@ -4855,8 +4879,6 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                       95
-
        Default: no
 
        When _s_e_t, the initial prompt for recipients and subject are skipped when reply-
@@ -4864,12 +4886,14 @@
        messages.
 
        NNoottee:: this variable has no effect when the ``_$_a_u_t_o_e_d_i_t (section 6.4.17  , page
-       84)'' variable is _s_e_t.
+       85)'' variable is _s_e_t.
 
        _6_._4_._6_1  _f_c_c___a_t_t_a_c_h
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                       96
+
        Default: yes
 
        This variable controls whether or not attachments on outgoing messages are
@@ -4891,7 +4915,7 @@
        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 86) value will
+       file attatchments.  If _u_n_s_e_t, _$_c_h_a_r_s_e_t (section 6.4.24  , page 87) value will
        be used instead.  For example, the following configuration would work for
        Japanese text handling:
 
@@ -4912,8 +4936,6 @@
        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.
 
-       The Mutt Next Generation E-Mail Client                                       96
-
        _6_._4_._6_5  _f_o_l_d_e_r___f_o_r_m_a_t
 
        Type: string
@@ -4922,11 +4944,13 @@
 
        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
-       105)'', but has its own set of printf(3)-like sequences:
+       106)'', but has its own set of printf(3)-like sequences:
 
              %C
                    current file number
 
+       The Mutt Next Generation E-Mail Client                                       97
+
              %d
                    date/time folder was last modified
 
@@ -4968,9 +4992,6 @@
 
        Controls whether or not the Mail-Followup-To: header field is generated when
        sending mail.  When _s_e_t, Mutt-ng will generate this field when you are replying
-
-       The Mutt Next Generation E-Mail Client                                       97
-
        to a known mailing list, specified with the ``subscribe'' or ``_l_i_s_t_s (section
        3.12  , page 32)'' commands or detected by common mailing list headers.
 
@@ -4983,6 +5004,8 @@
        a subscribed list will be sent to both the list and your address, resulting in
        two copies of the same email for you.
 
+       The Mutt Next Generation E-Mail Client                                       98
+
        _6_._4_._6_7  _f_o_r_c_e___b_u_f_f_y___c_h_e_c_k
 
        Type: boolean
@@ -4993,9 +5016,9 @@
        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.320  , page 159)'',
+       Also see the following variables: ``_$_t_i_m_e_o_u_t (section 6.4.321  , page 160)'',
        ``_$_m_a_i_l___c_h_e_c_k (section 6.4.115  , page 109)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
-       6.4.99  , page 103)''.
+       6.4.99  , page 104)''.
 
        _6_._4_._6_8  _f_o_r_c_e___n_a_m_e
 
@@ -5003,7 +5026,7 @@
 
        Default: no
 
-       This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 138)'',
+       This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 139)'',
        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.
 
@@ -5018,7 +5041,7 @@
        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 113)'' 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 113)'' is used instead.
+       ``_$_m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.137  , page 114)'' is used instead.
 
        _6_._4_._7_0  _f_o_r_w_a_r_d___d_e_c_r_y_p_t
 
@@ -5026,12 +5049,10 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                       98
-
        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 113)'' 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 113)'' is _u_n_s_e_t.  (PGP only)
+       _w_a_r_d___d_e_c_o_d_e (section 6.4.137  , page 114)'' is _u_n_s_e_t.  (PGP only)
 
        _6_._4_._7_1  _f_o_r_w_a_r_d___e_d_i_t
 
@@ -5039,6 +5060,8 @@
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                       99
+
        This quadoption controls whether or not the user is automatically placed in the
        editor when forwarding messages.  For those who always want to forward with no
        modification, use a setting of _n_o.
@@ -5051,7 +5074,7 @@
 
        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
-       105)'' variable.
+       106)'' variable.
 
        _6_._4_._7_3  _f_o_r_w_a_r_d___q_u_o_t_e
 
@@ -5061,7 +5084,7 @@
 
        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 113)'' 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 105)''.
+       ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109  , page 106)''.
 
        _6_._4_._7_4  _f_r_o_m
 
@@ -5071,8 +5094,8 @@
 
        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
-       137)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 6.4.329  , page
-       160)'' is unset.
+       138)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 6.4.330  , page
+       162)'' 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
@@ -5082,8 +5105,6 @@
 
        _6_._4_._7_5  _g_e_c_o_s___m_a_s_k
 
-       The Mutt Next Generation E-Mail Client                                       99
-
        Type: regular expression
 
        Default: '^[^,]*'
@@ -5095,6 +5116,9 @@
        do: set gecos_mask='.*'.
 
        This can be useful if you see the following behavior: you address a e-mail to
+
+       The Mutt Next Generation E-Mail Client                                      100
+
        user ID stevef whose full name is Steve Franklin.  If Mutt-ng expands stevef to
        ``Franklin'' stevef@foo.bar then you should set the gecos_mask to a regular
        expression that will match the whole name so Mutt-ng will expand ``Franklin''
@@ -5118,8 +5142,8 @@
        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.335  , page
-       162)'' setting applies.
+       are replying to into the edit buffer.  The ``_$_w_e_e_d (section 6.4.336  , page
+       163)'' setting applies.
 
        _6_._4_._7_8  _h_e_a_d_e_r___c_a_c_h_e
 
@@ -5129,16 +5153,14 @@
 
        Availability: Header Cache
 
-       The _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  , page 98) variable points to the header
+       The _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  , page 99) variable points to the header
        cache database.
 
-       If _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  , page 98) points to a directory it will con-
+       If _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  , page 99) points to a directory it will con-
        tain a header cache database  per folder. If _$_h_e_a_d_e_r___c_a_c_h_e (section 6.4.78  ,
-       page 98) points to a file that file will be a single global header cache. By
+       page 99) 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.
 
-       The Mutt Next Generation E-Mail Client                                      100
-
        _6_._4_._7_9  _h_e_a_d_e_r___c_a_c_h_e___c_o_m_p_r_e_s_s
 
        Type: boolean
@@ -5151,6 +5173,8 @@
 
        _6_._4_._8_0  _h_e_l_p
 
+       The Mutt Next Generation E-Mail Client                                      101
+
        Type: boolean
 
        Default: yes
@@ -5171,7 +5195,7 @@
        Default: no
 
        When _s_e_t, Mutt-ng will skip the host name part of ``_$_h_o_s_t_n_a_m_e (section
-       6.4.89  , page 100)'' variable when adding the domain part to addresses.  This
+       6.4.89  , page 101)'' 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.
 
@@ -5193,8 +5217,6 @@
        When _s_e_t, Mutt-ng will not show the presence of missing messages in the thread
        tree.
 
-       The Mutt Next Generation E-Mail Client                                      101
-
        _6_._4_._8_4  _h_i_d_e___t_h_r_e_a_d___s_u_b_j_e_c_t
 
        Type: boolean
@@ -5208,11 +5230,13 @@
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      102
+
        Default: no
 
        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 99) is set, this option will have no effect.
+       _i_n_g (section 6.4.83  , page 100) 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
 
@@ -5222,7 +5246,7 @@
 
        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 99) is _s_e_t, this option will have no effect.
+       page 100) is _s_e_t, this option will have no effect.
 
        _6_._4_._8_7  _h_i_s_t_o_r_y
 
@@ -5249,9 +5273,6 @@
        Default: ''
 
        Specifies the hostname to use after the ``@'' in local e-mail addresses and
-
-       The Mutt Next Generation E-Mail Client                                      102
-
        during generation of Message-Id: headers.
 
        Please be sure to really know what you are doing when changing this variable to
@@ -5265,6 +5286,9 @@
 
        Affects the behaviour of the _r_e_p_l_y function when replying to messages from
        mailing lists.  When _s_e_t, if the ``Reply-To:'' header field is set to the same
+
+       The Mutt Next Generation E-Mail Client                                      103
+
        value as the ``To:'' header field, Mutt-ng assumes that the ``Reply-To:''
        header field was set by the mailing list to automate responses to the list, and
        will ignore this field.  To direct a response to the mailing list when this
@@ -5306,8 +5330,6 @@
 
        _6_._4_._9_3  _i_m_a_p___d_e_l_i_m___c_h_a_r_s
 
-       The Mutt Next Generation E-Mail Client                                      103
-
        Type: string
 
        Default: '/.'
@@ -5316,12 +5338,14 @@
 
        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 94) variable.
+       shortcut for your _$_f_o_l_d_e_r (section 6.4.64  , page 95) variable.
 
        _6_._4_._9_4  _i_m_a_p___h_e_a_d_e_r_s
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      104
+
        Default: ''
 
        Availability: IMAP
@@ -5362,9 +5386,6 @@
        violated every now and then.
 
        Reduce this number if you find yourself getting disconnected from your IMAP
-
-       The Mutt Next Generation E-Mail Client                                      104
-
        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
@@ -5379,6 +5400,8 @@
        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.
 
+       The Mutt Next Generation E-Mail Client                                      105
+
        _6_._4_._9_8  _i_m_a_p___l_o_g_i_n
 
        Type: string
@@ -5390,7 +5413,7 @@
        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
-       104).''
+       105).''
 
        _6_._4_._9_9  _i_m_a_p___m_a_i_l___c_h_e_c_k
 
@@ -5418,8 +5441,6 @@
        machine, because the superuser can read your configuration even if you are the
        only one who can read the file.
 
-       The Mutt Next Generation E-Mail Client                                      105
-
        _6_._4_._1_0_1  _i_m_a_p___p_a_s_s_i_v_e
 
        Type: boolean
@@ -5435,6 +5456,8 @@
 
        _6_._4_._1_0_2  _i_m_a_p___p_e_e_k
 
+       The Mutt Next Generation E-Mail Client                                      106
+
        Type: boolean
 
        Default: yes
@@ -5474,8 +5497,6 @@
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      106
-
        Default: ''
 
        Availability: IMAP
@@ -5491,6 +5512,9 @@
        Default: no
 
        If _s_e_t, Mutt-ng will look for a mailcap entry with the ``copiousoutput'' flag
+
+       The Mutt Next Generation E-Mail Client                                      107
+
        set for _e_v_e_r_y MIME attachment it doesn't have an internal viewer defined for.
        If such an entry is found, Mutt-ng will use the viewer defined in that entry to
        convert the body part to text form.
@@ -5529,11 +5553,8 @@
 
        Default: '%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s'
 
-       This variable allows you to customize the message index display to your
-
-       The Mutt Next Generation E-Mail Client                                      107
-
-       personal taste.
+       This variable allows you to customize the message index display to your per-
+       sonal taste.
 
        ``Format strings'' are similar to the strings used in the ``C'' function
        printf(3) to format output (see the man page for more detail).  The following
@@ -5548,6 +5569,8 @@
              %b
                    filename of the original message folder (think mailBox)
 
+       The Mutt Next Generation E-Mail Client                                      108
+
              %B
                    the list to which the letter was sent, or else the folder name
                    (%b).
@@ -5587,8 +5610,6 @@
              %i
                    message-id of the current message
 
-       The Mutt Next Generation E-Mail Client                                      108
-
              %l
                    number of lines in the message (does not work with maildir, mh, and
                    possibly IMAP folders)
@@ -5604,6 +5625,8 @@
              %M
                    number of hidden messages if the thread is collapsed.
 
+       The Mutt Next Generation E-Mail Client                                      109
+
              %N
                    message score
 
@@ -5624,8 +5647,8 @@
                    `to:' field (recipients)
 
              %T
-                   the appropriate character from the _$_t_o___c_h_a_r_s (section 6.4.322  ,
-                   page 159) string
+                   the appropriate character from the _$_t_o___c_h_a_r_s (section 6.4.323  ,
+                   page 160) string
 
              %u
                    user (login) name of the author
@@ -5642,11 +5665,8 @@
 
              %Y
                    `x-label' field, if present, and (1) not at part of a thread tree,
-                   (2) at the top of a thread, or (3) `x-label' is different from
-
-       The Mutt Next Generation E-Mail Client                                      109
-
-                   preceding message's `x-label'.
+                   (2) at the top of a thread, or (3) `x-label' is different from pre-
+                   ceding message's `x-label'.
 
              %Z
                    message status flags
@@ -5661,6 +5681,8 @@
                    zone, and ``fmt'' is expanded by the library function ``strftime'';
                    a leading bang disables locales
 
+       The Mutt Next Generation E-Mail Client                                      110
+
              %(fmt)
                    the local date and time when the message was received.  ``fmt'' is
                    expanded by the library function ``strftime''; a leading bang dis-
@@ -5676,7 +5698,7 @@
              %|X
                    pad to the end of the line with character 'X'
 
-       See also: ``_$_t_o___c_h_a_r_s (section 6.4.322  , page 159)''.
+       See also: ``_$_t_o___c_h_a_r_s (section 6.4.323  , page 160)''.
 
        _6_._4_._1_1_1  _i_s_p_e_l_l
 
@@ -5693,15 +5715,13 @@
        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 110)'' mailbox, or as a result of
+       box to your ``_$_m_b_o_x (section 6.4.124  , page 111)'' 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
 
        Type: quadoption
 
-       The Mutt Next Generation E-Mail Client                                      110
-
        Default: no
 
        When _s_e_t, address replies to the mailing list the original message came from
@@ -5717,6 +5737,8 @@
        The locale used by strftime(3) to format dates. Legal values are the strings
        your system accepts for the locale variable LC_TIME.
 
+       The Mutt Next Generation E-Mail Client                                      111
+
        _6_._4_._1_1_5  _m_a_i_l___c_h_e_c_k
 
        Type: number
@@ -5727,7 +5749,7 @@
        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 103).
+       6.4.99  , page 104).
 
        _6_._4_._1_1_6  _m_a_i_l_c_a_p___p_a_t_h
 
@@ -5756,8 +5778,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      111
-
        Availability: Header Cache
 
        Check for Maildir unaware programs other than Mutt-ng having modified maildir
@@ -5773,6 +5793,8 @@
        If _s_e_t, messages marked as deleted will be saved with the maildir (T)rashed
        flag instead of physically deleted.
 
+       The Mutt Next Generation E-Mail Client                                      112
+
        NNOOTTEE:: this only applies to maildir-style mailboxes. Setting it will have no
        effect on other mailbox types.
 
@@ -5811,8 +5833,6 @@
        operator ``!''.  Only files whose names match this mask will be shown. The
        match is always case-sensitive.
 
-       The Mutt Next Generation E-Mail Client                                      112
-
        _6_._4_._1_2_3  _m_a_x___l_i_n_e___l_e_n_g_t_h
 
        Type: number
@@ -5822,7 +5842,7 @@
        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.337  , page 162).
+       (section 6.4.338  , page 163).
 
        _6_._4_._1_2_4  _m_b_o_x
 
@@ -5830,8 +5850,10 @@
 
        Default: '~/mbox'
 
+       The Mutt Next Generation E-Mail Client                                      113
+
        This specifies the folder into which read mail in your ``_$_s_p_o_o_l_f_i_l_e (section
-       6.4.296  , page 151)'' folder will be appended.
+       6.4.297  , page 152)'' folder will be appended.
 
        _6_._4_._1_2_5  _m_b_o_x___t_y_p_e
 
@@ -5850,7 +5872,7 @@
 
        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
-       121)''.)
+       122)''.)
 
        _6_._4_._1_2_7  _m_e_n_u___m_o_v_e___o_f_f
 
@@ -5868,8 +5890,6 @@
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      113
-
        When _s_e_t, menus will be scrolled up or down one line when you attempt to move
        across a screen boundary.  If _u_n_s_e_t, the screen is cleared and the next or pre-
        vious page of the menu is displayed (useful for slow links to avoid many
@@ -5883,7 +5903,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 105)''.
+       section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106)''.
+
+       The Mutt Next Generation E-Mail Client                                      114
 
        _6_._4_._1_3_0  _m_e_t_a___k_e_y
 
@@ -5925,8 +5947,6 @@
 
        The name of the MH sequence used for flagged messages.
 
-       The Mutt Next Generation E-Mail Client                                      114
-
        _6_._4_._1_3_4  _m_h___s_e_q___r_e_p_l_i_e_d
 
        Type: string
@@ -5941,6 +5961,8 @@
 
        Default: 'unseen'
 
+       The Mutt Next Generation E-Mail Client                                      115
+
        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
@@ -5956,8 +5978,8 @@
        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 96)'' and ``_$_m_i_m_e___f_o_r_-
-       _w_a_r_d___d_e_c_o_d_e (section 6.4.137  , page 113)''.
+       Also see ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.69  , page 97)'' and ``_$_m_i_m_e___f_o_r_-
+       _w_a_r_d___d_e_c_o_d_e (section 6.4.137  , page 114)''.
 
        _6_._4_._1_3_7  _m_i_m_e___f_o_r_w_a_r_d___d_e_c_o_d_e
 
@@ -5967,7 +5989,7 @@
 
        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 113)'' is _s_e_t. Other-
-       wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.69  , page 96)'' is used instead.
+       wise ``_$_f_o_r_w_a_r_d___d_e_c_o_d_e (section 6.4.69  , page 97)'' is used instead.
 
        _6_._4_._1_3_8  _m_i_m_e___f_o_r_w_a_r_d___r_e_s_t
 
@@ -5981,8 +6003,6 @@
 
        _6_._4_._1_3_9  _m_i_x___e_n_t_r_y___f_o_r_m_a_t
 
-       The Mutt Next Generation E-Mail Client                                      115
-
        Type: string
 
        Default: '%4n %c %-16s %a'
@@ -5998,6 +6018,8 @@
              %c
                    Remailer capabilities.
 
+       The Mutt Next Generation E-Mail Client                                      116
+
              %s
                    The remailer's short name.
 
@@ -6023,7 +6045,7 @@
        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 110)'' mailbox, or as a result of a
+       to your ``_$_m_b_o_x (section 6.4.124  , page 111)'' 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
@@ -6037,8 +6059,6 @@
        generated. The '%' character marks that certain data will be added to the
        string, similar to printf(3). The following characters are allowed:
 
-       The Mutt Next Generation E-Mail Client                                      116
-
              %d
                    the current day of month
 
@@ -6054,6 +6074,8 @@
              %O
                    the current UNIX timestamp (octal)
 
+       The Mutt Next Generation E-Mail Client                                      117
+
              %p
                    the process ID
 
@@ -6094,8 +6116,6 @@
        This variable, when _s_e_t, makes the thread tree narrower, allowing deeper
        threads to fit on the screen.
 
-       The Mutt Next Generation E-Mail Client                                      117
-
        _6_._4_._1_4_4  _n_n_t_p___a_s_k___f_o_l_l_o_w_u_p___t_o
 
        Type: boolean
@@ -6111,6 +6131,8 @@
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      118
+
        Default: no
 
        Availability: NNTP
@@ -6150,16 +6172,14 @@
 
        Default: 1000
 
-       The Mutt Next Generation E-Mail Client                                      118
-
        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 116)) and how
+       caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 6.4.146  , page 117)) 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 116), all older ones will be removed/not shown in the index.
+       page 117), 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
 
@@ -6167,6 +6187,8 @@
 
        Default: ask-yes
 
+       The Mutt Next Generation E-Mail Client                                      119
+
        Availability: NNTP
 
        If this variable is _s_e_t and the keyword 'poster' is present in the Followup-To:
@@ -6183,7 +6205,7 @@
 
        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 105)'', but has its own set of printf(3)-like sequences:
+       page 106)'', but has its own set of printf(3)-like sequences:
 
             %C      current newsgroup number
             %d      description of newsgroup (retrieved from server)
@@ -6205,8 +6227,6 @@
 
        This variable specifies the name (or address) of the NNTP server to be used.
 
-       The Mutt Next Generation E-Mail Client                                      119
-
        It defaults to the value specified via the environment variable $NNTPSERVER or
        contained in the file /etc/nntpserver.
 
@@ -6221,6 +6241,8 @@
 
        _6_._4_._1_5_2  _n_n_t_p___i_n_e_w_s
 
+       The Mutt Next Generation E-Mail Client                                      120
+
        Type: path
 
        Default: ''
@@ -6258,8 +6280,6 @@
        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.).
 
-       The Mutt Next Generation E-Mail Client                                      120
-
        _6_._4_._1_5_5  _n_n_t_p___m_i_m_e___s_u_b_j_e_c_t
 
        Type: boolean
@@ -6275,6 +6295,8 @@
 
        _6_._4_._1_5_6  _n_n_t_p___n_e_w_s_r_c
 
+       The Mutt Next Generation E-Mail Client                                      121
+
        Type: path
 
        Default: '~/.newsrc'
@@ -6313,8 +6335,6 @@
        If set to _y_e_s, Mutt-ng will post articles to newsgroup that have not permis-
        sions to post (e.g. moderated).
 
-       The Mutt Next Generation E-Mail Client                                      121
-
        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.
 
@@ -6329,6 +6349,8 @@
        Controls whether or not Mutt-ng will try to reconnect to a newsserver when the
        was connection lost.
 
+       The Mutt Next Generation E-Mail Client                                      122
+
        _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
 
        Type: boolean
@@ -6370,8 +6392,6 @@
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      122
-
        Availability: NNTP
 
        Your login name on the NNTP server.  If _u_n_s_e_t and the server requires authen-
@@ -6385,6 +6405,8 @@
 
        Availability: NNTP
 
+       The Mutt Next Generation E-Mail Client                                      123
+
        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.
 
@@ -6426,8 +6448,6 @@
        will display the line after the last one on the screen at the top of the next
        page (0 lines of context).
 
-       The Mutt Next Generation E-Mail Client                                      123
-
        _6_._4_._1_6_8  _p_a_g_e_r___f_o_r_m_a_t
 
        Type: string
@@ -6436,11 +6456,13 @@
 
        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 105)''
+       sequences are listed in the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106)''
        section.
 
        _6_._4_._1_6_9  _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
 
+       The Mutt Next Generation E-Mail Client                                      124
+
        Type: number
 
        Default: 0
@@ -6482,8 +6504,6 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      124
-
        Default: no
 
        This option controls whether Mutt-ng generates old-style inline (traditional)
@@ -6493,11 +6513,13 @@
        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 126)''.
+       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 6.4.188  , page 127)''.
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
+       The Mutt Next Generation E-Mail Client                                      125
+
        _6_._4_._1_7_3  _p_g_p___c_h_e_c_k___e_x_i_t
 
        Type: boolean
@@ -6539,10 +6561,8 @@
                    Expands to the name of a file containing the signature part of a
                    multipart/signed attachment when verifying it.
 
-       The Mutt Next Generation E-Mail Client                                      125
-
              %a
-                   The value of _$_p_g_p___s_i_g_n___a_s (section 6.4.192  , page 127).
+                   The value of _$_p_g_p___s_i_g_n___a_s (section 6.4.192  , page 128).
 
              %r
                    One or more key IDs.
@@ -6554,6 +6574,8 @@
 
        _6_._4_._1_7_6  _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d
 
+       The Mutt Next Generation E-Mail Client                                      126
+
        Type: string
 
        Default: ''
@@ -6584,7 +6606,7 @@
 
        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
-       105)'', but has its own set of printf(3)-like sequences:
+       106)'', but has its own set of printf(3)-like sequences:
 
              %n
                    number
@@ -6595,8 +6617,6 @@
              %u
                    user id
 
-       The Mutt Next Generation E-Mail Client                                      126
-
              %a
                    algorithm
 
@@ -6609,6 +6629,8 @@
              %c
                    capabilities
 
+       The Mutt Next Generation E-Mail Client                                      127
+
              %t
                    trust/validity of the key-uid association
 
@@ -6652,8 +6674,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      127
-
        Setting this variable will cause Mutt-ng to ignore OpenPGP subkeys. Instead,
        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)
@@ -6665,6 +6685,9 @@
        Default: ''
 
        This command is used to import a key from a message into the user's public key
+
+       The Mutt Next Generation E-Mail Client                                      128
+
        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
@@ -6708,9 +6731,6 @@
 
        This option controls whether Mutt-ng will prompt you for automatically sending
        a (signed/encrypted) message using PGP/MIME when inline (traditional) fails
-
-       The Mutt Next Generation E-Mail Client                                      128
-
        (for any reason).
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
@@ -6722,6 +6742,8 @@
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      129
+
        Setting this variable will cause Mutt-ng to always attempt to create an inline
        (traditional) message when replying to a message which is PGP encrypted/signed
        inline.  This can be overridden by use of the _p_g_p_-_m_e_n_u, when inline is not
@@ -6732,7 +6754,7 @@
        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 126)''.
+       ``_$_p_g_p___m_i_m_e___a_u_t_o (section 6.4.188  , page 127)''.
 
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
@@ -6766,8 +6788,6 @@
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      129
-
        If you have more than one key pair, this option allows you to specify which of
        your private keys to use.  It is recommended that you use the keyid form to
        specify your key (e.g., ``0x00112233'').  (PGP only)
@@ -6778,6 +6798,8 @@
 
        Default: ''
 
+       The Mutt Next Generation E-Mail Client                                      130
+
        This command is used to create the detached PGP signature for a multi-
        part/signed PGP/MIME body part.  (PGP only)
 
@@ -6822,8 +6844,6 @@
 
        Default: 300
 
-       The Mutt Next Generation E-Mail Client                                      130
-
        The number of seconds after which a cached passphrase will expire if not used.
        Default: 300.  (PGP only)
 
@@ -6835,6 +6855,8 @@
 
        If _s_e_t, Mutt-ng will use a possibly-running gpg-agent process.  (PGP only)
 
+       The Mutt Next Generation E-Mail Client                                      131
+
        _6_._4_._1_9_8  _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
@@ -6878,14 +6900,11 @@
        Default: no
 
        Used in connection with the _p_i_p_e_-_m_e_s_s_a_g_e command and the ``tag- prefix'' or
-
-       The Mutt Next Generation E-Mail Client                                      131
-
        ``tag-prefix-cond'' operators.  If this variable is _u_n_s_e_t, when piping a list
        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 129)'' separator is added after each message.
+       (section 6.4.201  , page 130)'' separator is added after each message.
 
        _6_._4_._2_0_3  _p_o_p___a_u_t_h___t_r_y___a_l_l
 
@@ -6893,6 +6912,8 @@
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      132
+
        Availability: POP
 
        If _s_e_t, Mutt-ng will try all available methods. When _u_n_s_e_t, Mutt-ng will only
@@ -6935,8 +6956,6 @@
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      132
-
        Default: ''
 
        Availability: POP
@@ -6949,6 +6968,8 @@
        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                                      133
+
        _6_._4_._2_0_7  _p_o_p___l_a_s_t
 
        Type: boolean
@@ -6991,8 +7012,6 @@
 
        Default: ask-yes
 
-       The Mutt Next Generation E-Mail Client                                      133
-
        Availability: POP
 
        Controls whether or not Mutt-ng will try to reconnect to a POP server when the
@@ -7006,6 +7025,8 @@
 
        Availability: POP
 
+       The Mutt Next Generation E-Mail Client                                      134
+
        Your login name on the POP server.
 
        This variable defaults to your user name on the local machine.
@@ -7016,7 +7037,7 @@
 
        Default: ''
 
-       Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 6.4.15  , page 84)'' variable, Mutt-ng
+       Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 6.4.15  , page 85)'' variable, Mutt-ng
        will append this string after the inclusion of a message which is being replied
        to.
 
@@ -7027,7 +7048,7 @@
        Default: ask-yes
 
        Controls whether or not messages are saved in the ``_$_p_o_s_t_p_o_n_e_d (section
-       6.4.214  , page 132)'' mailbox when you elect not to send immediately.
+       6.4.214  , page 133)'' mailbox when you elect not to send immediately.
 
        _6_._4_._2_1_4  _p_o_s_t_p_o_n_e_d
 
@@ -7035,10 +7056,10 @@
 
        Default: '~/postponed'
 
-       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 6.4.213  , page 132)
+       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 6.4.213  , page 133)
        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 132)'' variable.
+       ``_$_p_o_s_t_p_o_n_e (section 6.4.213  , page 133)'' variable.
 
        _6_._4_._2_1_5  _p_r_e_c_o_n_n_e_c_t
 
@@ -7046,13 +7067,10 @@
 
        Default: ''
 
-       If _s_e_t, a shell command to be executed if Mutt-ng fails to establish a
-
-       The Mutt Next Generation E-Mail Client                                      134
-
-       connection to the server. This is useful for setting up secure connections,
-       e.g. with ssh(1). If the command returns a  nonzero status, Mutt-ng gives up
-       opening the server. Example:
+       If _s_e_t, a shell command to be executed if Mutt-ng fails to establish a connec-
+       tion to the server. This is useful for setting up secure connections, e.g. with
+       ssh(1). If the command returns a  nonzero status, Mutt-ng gives up opening the
+       server. Example:
 
        preconnect='ssh -f -q -L 1234:mailhost.net:143 mailhost.net sleep 20 <
        /dev/null > /dev/null'
@@ -7062,6 +7080,8 @@
        NNoottee:: For this example to work, you must be able to log in to the remote
        machine without having to enter a password.
 
+       The Mutt Next Generation E-Mail Client                                      135
+
        _6_._4_._2_1_6  _p_r_i_n_t
 
        Type: quadoption
@@ -7087,7 +7107,7 @@
 
        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 133).  If this option is _u_n_s_e_t, no pro-
+       _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.217  , page 134).  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.
@@ -7099,14 +7119,12 @@
        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 133) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.217  , page 134) 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 133) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 6.4.217  , page 134) is executed
        only once, and all the messages are concatenated, with a form feed as the mes-
        sage separator.
 
-       The Mutt Next Generation E-Mail Client                                      135
-
        Those who use the enscript(1) program's mail-printing mode will most likely
        want to set this option.
 
@@ -7116,8 +7134,11 @@
 
        Default: yes
 
-       If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 6.4.166  , page 121)'', setting this
+       If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 6.4.166  , page 122)'', setting this
        variable will cause Mutt-ng to prompt you for a command when the pager exits
+
+       The Mutt Next Generation E-Mail Client                                      136
+
        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.
 
@@ -7150,7 +7171,7 @@
        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 105)''.
+       tion 6.4.109  , page 106)''.
 
        _6_._4_._2_2_4  _q_u_o_t_e___q_u_o_t_e_d
 
@@ -7160,9 +7181,7 @@
 
        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 105)''.
-
-       The Mutt Next Generation E-Mail Client                                      136
+       by ``_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109  , page 106)''.
 
        _6_._4_._2_2_5  _q_u_o_t_e___r_e_g_e_x_p
 
@@ -7174,6 +7193,9 @@
        text in the body of a message.
 
        NNoottee:: In order to use the _q_u_o_t_e_dxx patterns in the internal pager, you need to
+
+       The Mutt Next Generation E-Mail Client                                      137
+
        set this to a regular expression that matches _e_x_a_c_t_l_y the quote characters at
        the beginning of quoted lines.
 
@@ -7191,7 +7213,7 @@
        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.339  , page 162)'' variable.
+       Also see the ``_$_w_r_i_t_e___i_n_c (section 6.4.340  , page 163)'' variable.
 
        _6_._4_._2_2_7  _r_e_a_d___o_n_l_y
 
@@ -7213,23 +7235,23 @@
        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 97) variable.
+       _$_f_r_o_m (section 6.4.74  , page 98) variable.
 
        _6_._4_._2_2_9  _r_e_c_a_l_l
 
        Type: quadoption
 
-       The Mutt Next Generation E-Mail Client                                      137
-
        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 132)''.
+       message.  Also see ``_$_p_o_s_t_p_o_n_e_d (section 6.4.214  , page 133)''.
 
        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
 
+       The Mutt Next Generation E-Mail Client                                      138
+
        Type: path
 
        Default: ''
@@ -7240,8 +7262,8 @@
        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_6_) is overridden by the
-       ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 96)'' and ``_$_s_a_v_e___n_a_m_e (section
-       6.4.241  , page 138)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18  , page
+       ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 97)'' and ``_$_s_a_v_e___n_a_m_e (section
+       6.4.241  , page 139)'' 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
@@ -7275,9 +7297,6 @@
        use the address in the ``From:'' header field instead.
 
        This option is useful for reading a mailing list that sets the ``Reply-To:''
-
-       The Mutt Next Generation E-Mail Client                                      138
-
        header field to the list address and you want to send a private message to the
        author of a message.
 
@@ -7287,6 +7306,8 @@
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      139
+
        When set, the cursor will be automatically advanced to the next (possibly
        undeleted) message whenever a command that modifies the current message is exe-
        cuted.
@@ -7332,18 +7353,17 @@
        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  ,
-
-       The Mutt Next Generation E-Mail Client                                      139
-
-       page 137) feature.  When it is _s_e_t, Mutt-ng will use the address from incoming
+       page 138) 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 135) variable.
+       (section 6.4.228  , page 136) variable.
 
        _6_._4_._2_3_8  _r_f_c_2_0_4_7___p_a_r_a_m_e_t_e_r_s
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      140
+
        Default: no
 
        When this variable is _s_e_t, Mutt-ng will decode RFC-2047-encoded MIME parame-
@@ -7369,8 +7389,8 @@
        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 138)'' or
-       ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 96)'' is _s_e_t too, the selection of the
+       folder for saving a mail. If ``_$_s_a_v_e___n_a_m_e (section 6.4.241  , page 139)'' or
+       ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 97)'' 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
@@ -7380,7 +7400,7 @@
        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.296  , page 151)'' which is
+       closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 6.4.297  , page 152)'' 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
@@ -7390,18 +7410,18 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      140
-
        Default: no
 
        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 94)'' directory with the _u_s_e_r_n_a_m_e part of the recipient address).  If the
+       page 95)'' 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 136)'' mailbox.
 
-       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 96)'' variable.
+       The Mutt Next Generation E-Mail Client                                      141
+
+       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 6.4.68  , page 97)'' variable.
 
        _6_._4_._2_4_2  _s_c_o_r_e
 
@@ -7411,7 +7431,7 @@
 
        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 139)'' variable and friends are used.
+       _o_l_d___d_e_l_e_t_e (section 6.4.243  , page 140)'' 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
 
@@ -7446,17 +7466,18 @@
 
        _6_._4_._2_4_6  _s_e_n_d___c_h_a_r_s_e_t
 
-       The Mutt Next Generation E-Mail Client                                      141
-
        Type: string
 
        Default: 'us-ascii:iso-8859-1:utf-8'
 
        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 86)'' is not iso-8859-1 and recipients may not under-
+       (section 6.4.24  , page 87)'' is not iso-8859-1 and recipients may not under-
        stand UTF-8, it is advisable to include in the list an appropriate widely used
        standard character set (such as iso-8859-2, koi8-r or iso-2022-jp) either
+
+       The Mutt Next Generation E-Mail Client                                      142
+
        instead of or after iso-8859-1.
 
        _6_._4_._2_4_7  _s_e_n_d_m_a_i_l
@@ -7503,8 +7524,6 @@
        Command to use when spawning a subshell.  By default, the user's login shell
        from /etc/passwd is used.
 
-       The Mutt Next Generation E-Mail Client                                      142
-
        _6_._4_._2_5_0  _s_i_d_e_b_a_r___b_o_u_n_d_a_r_y
 
        Type: string
@@ -7513,6 +7532,9 @@
 
        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 142) is _s_e_t, this variable specifies the characters at which to
+
+       The Mutt Next Generation E-Mail Client                                      143
+
        split a folder name into ``hierarchy items.''
 
        _6_._4_._2_5_1  _s_i_d_e_b_a_r___d_e_l_i_m
@@ -7558,8 +7580,6 @@
              %M
                    Total number of messages shown, i.e. not hidden by a limit. 1)
 
-       The Mutt Next Generation E-Mail Client                                      143
-
              %n
                    Number of new messages.
 
@@ -7569,6 +7589,8 @@
        1) These expandos only have a non-zero value for the current mailbox and will
        always be zero otherwise.
 
+       The Mutt Next Generation E-Mail Client                                      144
+
        _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
 
        Type: boolean
@@ -7577,13 +7599,13 @@
 
        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 142)'' is set to a too low value). For example, if the news-
+       6.4.256  , page 143)'' 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 140) variable.
+       _b_a_r___b_o_u_n_d_a_r_y (section 6.4.250  , page 141) variable.
 
        _6_._4_._2_5_5  _s_i_d_e_b_a_r___v_i_s_i_b_l_e
 
@@ -7614,8 +7636,6 @@
        name. The reason for this is because many software packages use ``-- \n'' to
        detect your signature.
 
-       The Mutt Next Generation E-Mail Client                                      144
-
        For example, Mutt-ng has the ability to highlight the signature in a different
        color in the builtin pager.
 
@@ -7625,6 +7645,8 @@
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      145
+
        If _s_e_t, the signature will be included before any quoted or forwarded text.  It
        is ssttrroonnggllyy recommended that you do not set this variable unless you really
        know what you are doing, and are prepared to take some heat from netiquette
@@ -7669,8 +7691,6 @@
 
        ~f joe | ~s joe
 
-       The Mutt Next Generation E-Mail Client                                      145
-
        _6_._4_._2_6_2  _s_l_e_e_p___t_i_m_e
 
        Type: number
@@ -7682,6 +7702,8 @@
        the current folder.  The default is to pause one second, so a value of zero for
        this option suppresses the pause.
 
+       The Mutt Next Generation E-Mail Client                                      146
+
        _6_._4_._2_6_3  _s_m_a_r_t___w_r_a_p
 
        Type: boolean
@@ -7691,7 +7713,7 @@
        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 110)'' variable.
+       page 111)'' variable.
 
        _6_._4_._2_6_4  _s_m_i_l_e_y_s
 
@@ -7700,7 +7722,7 @@
        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 134)'', most notably smileys in the
+       ``_$_q_u_o_t_e___r_e_g_e_x_p (section 6.4.225  , page 135)'', 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
@@ -7726,8 +7748,6 @@
 
        Type: path
 
-       The Mutt Next Generation E-Mail Client                                      146
-
        Default: ''
 
        Since there is no pubring/secring as with PGP, Mutt-ng has to handle storage
@@ -7737,6 +7757,8 @@
        address keyid pairs, and which can be manually edited. This one points to the
        location of the certificates.  (S/MIME only)
 
+       The Mutt Next Generation E-Mail Client                                      147
+
        _6_._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
@@ -7758,7 +7780,7 @@
 
              %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 145)
+                   page 146)
 
              %c
                    One or more certificate IDs.
@@ -7768,9 +7790,9 @@
 
              %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 144) 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 144)' or
-                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.266  , page 144)'.
+                   6.4.266  , page 145) 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 145)' or
+                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 6.4.266  , page 145)'.
 
        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-
@@ -7782,8 +7804,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      147
-
        If _s_e_t (default) this tells Mutt-ng to use the default key for decryption. Oth-
        erwise, if manage multiple certificate-key-pairs, Mutt-ng will try to use the
        mailbox-address to determine the key to use. It will ask you to supply a key,
@@ -7793,6 +7813,8 @@
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      148
+
        Default: ''
 
        This is the default key-pair to use for signing. This must be set to the keyid
@@ -7838,8 +7860,6 @@
 
        _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
 
-       The Mutt Next Generation E-Mail Client                                      148
-
        Type: string
 
        Default: ''
@@ -7848,6 +7868,8 @@
        signature, so that the certificate's owner may get compared to the email's
        ``From:'' header field.  (S/MIME only)
 
+       The Mutt Next Generation E-Mail Client                                      149
+
        _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
 
        Type: string
@@ -7893,8 +7915,6 @@
        This command is used to extract PKCS7 structures of S/MIME signatures, in order
        to extract the public X509 certificate(s).  (S/MIME only)
 
-       The Mutt Next Generation E-Mail Client                                      149
-
        _6_._4_._2_8_0  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
@@ -7904,6 +7924,8 @@
        This command is used to created S/MIME signatures of type multipart/signed,
        which can be read by all mail clients.  (S/MIME only)
 
+       The Mutt Next Generation E-Mail Client                                      150
+
        _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
 
        Type: string
@@ -7941,7 +7963,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___h_o_s_t
+       _6_._4_._2_8_5  _s_m_t_p___e_n_v_e_l_o_p_e
 
        Type: string
 
@@ -7949,13 +7971,28 @@
 
        Availability: SMTP
 
-       The Mutt Next Generation E-Mail Client                                      150
+       If this variable is non-empty, it'll be used as the envelope sender. If it's
+       empty (the default), the value of the regular From: header will be used.
+
+       This may be necessary as some providers don't allow for arbitrary values as the
+       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
+
+       The Mutt Next Generation E-Mail Client                                      151
+
+       Type: string
+
+       Default: ''
+
+       Availability: SMTP
 
        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 140)'', and any associated variables.
 
-       _6_._4_._2_8_6  _s_m_t_p___p_a_s_s
+       _6_._4_._2_8_7  _s_m_t_p___p_a_s_s
 
        Type: string
 
@@ -7963,14 +8000,14 @@
 
        Availability: SMTP
 
-       Defines the password to use with SMTP AUTH.  If ``_$_s_m_t_p___a_u_t_h___u_s_e_r_n_a_m_e (section
-       , page )'' is set, but this variable is not, you will be prompted for a pass-
-       word when sending.
+       Defines the password to use with SMTP AUTH.  If ``_$_s_m_t_p___u_s_e_r (section
+       6.4.290  , page 150)'' 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.
 
-       _6_._4_._2_8_7  _s_m_t_p___p_o_r_t
+       _6_._4_._2_8_8  _s_m_t_p___p_o_r_t
 
        Type: number
 
@@ -7984,7 +8021,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_8  _s_m_t_p___u_s_e___t_l_s
+       _6_._4_._2_8_9  _s_m_t_p___u_s_e___t_l_s
 
        Type: string
 
@@ -7998,7 +8035,9 @@
        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_8_9  _s_m_t_p___u_s_e_r
+       The Mutt Next Generation E-Mail Client                                      152
+
+       _6_._4_._2_9_0  _s_m_t_p___u_s_e_r
 
        Type: string
 
@@ -8006,12 +8045,10 @@
 
        Availability: SMTP
 
-       The Mutt Next Generation E-Mail Client                                      151
-
        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_0  _s_o_r_t
+       _6_._4_._2_9_1  _s_o_r_t
 
        Type: sort order
 
@@ -8033,7 +8070,7 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort=reverse-date-sent).
 
-       _6_._4_._2_9_1  _s_o_r_t___a_l_i_a_s
+       _6_._4_._2_9_2  _s_o_r_t___a_l_i_a_s
 
        Type: sort order
 
@@ -8046,21 +8083,20 @@
                alias (sort alphabetically by alias name)
                unsorted (leave in order specified in .muttrc)
 
-       _6_._4_._2_9_2  _s_o_r_t___a_u_x
+       _6_._4_._2_9_3  _s_o_r_t___a_u_x
 
        Type: sort order
 
+       The Mutt Next Generation E-Mail Client                                      153
+
        Default: date
 
        When sorting by threads, this variable controls how threads are sorted in rela-
        tion to other threads, and how the branches of the thread trees are sorted.
-       This can be set to any value that ``_$_s_o_r_t (section 6.4.290  , page 149)'' can,
+       This can be set to any value that ``_$_s_o_r_t (section 6.4.291  , page 150)'' 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
-
-       The Mutt Next Generation E-Mail Client                                      152
-
        siblings by which has the last descendant, using the rest of sort_aux as an
        ordering.
 
@@ -8068,11 +8104,11 @@
        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.290  , page 149)'' order _$_s_o_r_t___a_u_x
-       (section 6.4.292  , page 150) is reversed again (which is not the right thing
+       NNoottee:: For reversed ``_$_s_o_r_t (section 6.4.291  , page 150)'' order _$_s_o_r_t___a_u_x
+       (section 6.4.293  , page 151) is reversed again (which is not the right thing
        to do, but kept to not break any existing configuration setting).
 
-       _6_._4_._2_9_3  _s_o_r_t___b_r_o_w_s_e_r
+       _6_._4_._2_9_4  _s_o_r_t___b_r_o_w_s_e_r
 
        Type: sort order
 
@@ -8089,38 +8125,37 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort_browser=reverse-date).
 
-       _6_._4_._2_9_4  _s_o_r_t___r_e
+       _6_._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.311  , page 157)'' _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.294  ,
-       page 151) _s_e_t, Mutt-ng will only attach a message as the child of another mes-
+       (section 6.4.312  , page 158)'' _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 152) _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 136)''. With
-       _$_s_o_r_t___r_e (section 6.4.294  , page 151) _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 6.4.231  , page 137)''. With
+       _$_s_o_r_t___r_e (section 6.4.295  , page 152) _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 136)'' parts of both messages are identical.
+       6.4.231  , page 137)'' parts of both messages are identical.
+
+       The Mutt Next Generation E-Mail Client                                      154
 
-       _6_._4_._2_9_5  _s_p_a_m___s_e_p_a_r_a_t_o_r
+       _6_._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.295  , page 151)'' controls what happens when
-       multiple spam headers are matched: if _u_n_s_e_t, each successive header will
+       ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 6.4.296  , page 152)'' 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 152)'' as a separator.
 
-       The Mutt Next Generation E-Mail Client                                      153
-
-       overwrite any previous matches value for the spam label. If _s_e_t, each succes-
-       sive match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section
-       6.4.295  , page 151)'' as a separator.
-
-       _6_._4_._2_9_6  _s_p_o_o_l_f_i_l_e
+       _6_._4_._2_9_7  _s_p_o_o_l_f_i_l_e
 
        Type: path
 
@@ -8131,7 +8166,7 @@
        set this variable to the value of the environment variable $MAIL if it is not
        set.
 
-       _6_._4_._2_9_7  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
+       _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
 
        Type: path
 
@@ -8143,7 +8178,7 @@
 
        Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 
-       _6_._4_._2_9_8  _s_s_l___c_l_i_e_n_t___c_e_r_t
+       _6_._4_._2_9_9  _s_s_l___c_l_i_e_n_t___c_e_r_t
 
        Type: path
 
@@ -8153,7 +8188,7 @@
 
        The file containing a client certificate and its associated private key.
 
-       _6_._4_._2_9_9  _s_s_l___f_o_r_c_e___t_l_s
+       _6_._4_._3_0_0  _s_s_l___f_o_r_c_e___t_l_s
 
        Type: boolean
 
@@ -8162,24 +8197,25 @@
        If this variable is _s_e_t, mutt-ng will require that all connections to remote
        servers be encrypted. Furthermore it will attempt to negotiate TLS even if the
        server does not advertise the capability, since it would otherwise have to
+
+       The Mutt Next Generation E-Mail Client                                      155
+
        abort the connection anyway. This option supersedes ``_$_s_s_l___s_t_a_r_t_t_l_s (section
-       6.4.301  , page 152)''.
+       6.4.302  , page 154)''.
 
-       _6_._4_._3_0_0  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
+       _6_._4_._3_0_1  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
 
        Type: number
 
        Default: 0
 
-       The Mutt Next Generation E-Mail Client                                      154
-
        Availability: GNUTLS
 
        This variable specifies the minimum acceptable prime size (in bits) for use in
        any Diffie-Hellman key exchange. A value of 0 will use the default from the
        GNUTLS library.
 
-       _6_._4_._3_0_1  _s_s_l___s_t_a_r_t_t_l_s
+       _6_._4_._3_0_2  _s_s_l___s_t_a_r_t_t_l_s
 
        Type: quadoption
 
@@ -8191,7 +8227,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_2  _s_s_l___u_s_e___s_s_l_v_2
+       _6_._4_._3_0_3  _s_s_l___u_s_e___s_s_l_v_2
 
        Type: boolean
 
@@ -8202,7 +8238,7 @@
        This variables specifies whether to attempt to use SSLv2 in the SSL authentica-
        tion process.
 
-       _6_._4_._3_0_3  _s_s_l___u_s_e___s_s_l_v_3
+       _6_._4_._3_0_4  _s_s_l___u_s_e___s_s_l_v_3
 
        Type: boolean
 
@@ -8213,23 +8249,23 @@
        This variables specifies whether to attempt to use SSLv3 in the SSL authentica-
        tion process.
 
-       _6_._4_._3_0_4  _s_s_l___u_s_e___t_l_s_v_1
+       _6_._4_._3_0_5  _s_s_l___u_s_e___t_l_s_v_1
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      156
+
        Availability: SSL or GNUTLS
 
        This variables specifies whether to attempt to use TLSv1 in the SSL authentica-
        tion process.
 
-       _6_._4_._3_0_5  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
+       _6_._4_._3_0_6  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      155
-
        Default: yes
 
        Availability: SSL
@@ -8237,14 +8273,14 @@
        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_6  _s_t_a_t_u_s___c_h_a_r_s
+       _6_._4_._3_0_7  _s_t_a_t_u_s___c_h_a_r_s
 
        Type: string
 
        Default: '-*%A'
 
        Controls the characters used by the ``%r'' indicator in ``_$_s_t_a_t_u_s___f_o_r_m_a_t (sec-
-       tion 6.4.307  , page 154)''. The first character is used when the mailbox is
+       tion 6.4.308  , page 155)''. 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
@@ -8253,7 +8289,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_7  _s_t_a_t_u_s___f_o_r_m_a_t
+       _6_._4_._3_0_8  _s_t_a_t_u_s___f_o_r_m_a_t
 
        Type: string
 
@@ -8262,7 +8298,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 105)'', but has
+       string is similar to ``_$_i_n_d_e_x___f_o_r_m_a_t (section 6.4.110  , page 106)'', but has
        its own set of printf(3)-like sequences:
 
              %b
@@ -8274,6 +8310,8 @@
              %d
                    number of deleted messages *
 
+       The Mutt Next Generation E-Mail Client                                      157
+
              %f
                    the full pathname of the current mailbox
 
@@ -8283,8 +8321,6 @@
              %h
                    local hostname
 
-       The Mutt Next Generation E-Mail Client                                      156
-
              %l
                    size (in bytes) of the current mailbox *
 
@@ -8313,14 +8349,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.306  , page 154)
+                   to _$_s_t_a_t_u_s___c_h_a_r_s (section 6.4.307  , page 155)
 
              %s
-                   current sorting mode (_$_s_o_r_t (section 6.4.290  , page 149))
+                   current sorting mode (_$_s_o_r_t (section 6.4.291  , page 150))
 
              %S
-                   current aux sorting method (_$_s_o_r_t___a_u_x (section 6.4.292  , page
-                   150))
+                   current aux sorting method (_$_s_o_r_t___a_u_x (section 6.4.293  , page
+                   151))
 
              %t
                    number of tagged messages *
@@ -8331,6 +8367,8 @@
              %v
                    Mutt-ng version string
 
+       The Mutt Next Generation E-Mail Client                                      158
+
              %V
                    currently active limit pattern, if any *
 
@@ -8340,8 +8378,6 @@
              %|X
                    pad to the end of the line with 'X'
 
-       The Mutt Next Generation E-Mail Client                                      157
-
        * = can be optionally printed if nonzero
 
        Some of the above sequences can be used to optionally print a string if their
@@ -8378,7 +8414,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_8  _s_t_a_t_u_s___o_n___t_o_p
+       _6_._4_._3_0_9  _s_t_a_t_u_s___o_n___t_o_p
 
        Type: boolean
 
@@ -8387,7 +8423,9 @@
        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_0_9  _s_t_r_i_c_t___m_a_i_l_t_o
+       The Mutt Next Generation E-Mail Client                                      159
+
+       _6_._4_._3_1_0  _s_t_r_i_c_t___m_a_i_l_t_o
 
        Type: boolean
 
@@ -8395,16 +8433,14 @@
 
        With mailto: style links, a body as well as arbitrary header information may be
        embedded. This may lead to (user) headers being overwriten without note if
-       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 92)'' is unset.
-
-       The Mutt Next Generation E-Mail Client                                      158
+       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 93)'' 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 92)'' is set to.
+       ``_$_e_d_i_t___h_e_a_d_e_r_s (section 6.4.54  , page 93)'' is set to.
 
-       _6_._4_._3_1_0  _s_t_r_i_c_t___m_i_m_e
+       _6_._4_._3_1_1  _s_t_r_i_c_t___m_i_m_e
 
        Type: boolean
 
@@ -8413,49 +8449,49 @@
        When _u_n_s_e_t, non MIME-compliant messages that doesn't have any charset indica-
        tion in the ``Content-Type:'' header field can be displayed (non MIME-compliant
        messages are often generated by old mailers or buggy mailers like MS Outlook
-       Express).  See also _$_a_s_s_u_m_e_d___c_h_a_r_s_e_t (section 6.4.11  , page 82).
+       Express).  See also _$_a_s_s_u_m_e_d___c_h_a_r_s_e_t (section 6.4.11  , page 83).
 
        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_1  _s_t_r_i_c_t___t_h_r_e_a_d_s
+       _6_._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.290  , page 149)'' by mes-
+       ences:'' header fields when you ``_$_s_o_r_t (section 6.4.291  , page 150)'' 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_2  _s_t_r_i_p___w_a_s
+       _6_._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.313  , page 157) when replying. This is
+       matches _$_s_t_r_i_p___w_a_s___r_e_g_e_x (section 6.4.314  , page 158) when replying. This is
        useful to properly react on subject changes and reduce ``subject noise.'' (esp.
        in Usenet)
 
-       _6_._4_._3_1_3  _s_t_r_i_p___w_a_s___r_e_g_e_x
+       The Mutt Next Generation E-Mail Client                                      160
+
+       _6_._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.312  , page 157) is _s_e_t, mutt-ng
+       When non-empty and _$_s_t_r_i_p___w_a_s (section 6.4.313  , page 158) is _s_e_t, mutt-ng
        will remove this trailing part of the ``Subject'' line when replying if it
        won't be empty afterwards.
 
-       The Mutt Next Generation E-Mail Client                                      159
-
-       _6_._4_._3_1_4  _s_t_u_f_f___q_u_o_t_e_d
+       _6_._4_._3_1_5  _s_t_u_f_f___q_u_o_t_e_d
 
        Type: boolean
 
@@ -8464,7 +8500,7 @@
        If _s_e_t, attachments with flowed format will have their quoting ``stuffed'',
        i.e. a space will be inserted between the quote characters and the actual text.
 
-       _6_._4_._3_1_5  _s_u_s_p_e_n_d
+       _6_._4_._3_1_6  _s_u_s_p_e_n_d
 
        Type: boolean
 
@@ -8474,7 +8510,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_6  _t_e_x_t___f_l_o_w_e_d
+       _6_._4_._3_1_7  _t_e_x_t___f_l_o_w_e_d
 
        Type: boolean
 
@@ -8485,10 +8521,10 @@
        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 105) is ignored when this
+       Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 6.4.109  , page 106) is ignored when this
        option is set.
 
-       _6_._4_._3_1_7  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
+       _6_._4_._3_1_8  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
 
        Type: boolean
 
@@ -8499,7 +8535,9 @@
        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_8  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
+       The Mutt Next Generation E-Mail Client                                      161
+
+       _6_._4_._3_1_9  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
 
        Type: boolean
 
@@ -8508,9 +8546,7 @@
        When _s_e_t, Mutt-ng uses the date received rather than the date sent to thread
        messages by subject.
 
-       The Mutt Next Generation E-Mail Client                                      160
-
-       _6_._4_._3_1_9  _t_i_l_d_e
+       _6_._4_._3_2_0  _t_i_l_d_e
 
        Type: boolean
 
@@ -8519,7 +8555,7 @@
        When _s_e_t, the internal-pager will pad blank lines to the bottom of the screen
        with a tilde (~).
 
-       _6_._4_._3_2_0  _t_i_m_e_o_u_t
+       _6_._4_._3_2_1  _t_i_m_e_o_u_t
 
        Type: number
 
@@ -8529,7 +8565,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_1  _t_m_p_d_i_r
+       _6_._4_._3_2_2  _t_m_p_d_i_r
 
        Type: path
 
@@ -8540,7 +8576,7 @@
        set, the environment variable $TMPDIR is used.  If $TMPDIR is not set then
        '/tmp' is used.
 
-       _6_._4_._3_2_2  _t_o___c_h_a_r_s
+       _6_._4_._3_2_3  _t_o___c_h_a_r_s
 
        Type: string
 
@@ -8556,7 +8592,9 @@
        indicate mail that was sent by _y_o_u.  The sixth character is used to indicate
        when a mail was sent to a mailing-list you're subscribe to (default: L).
 
-       _6_._4_._3_2_3  _t_r_a_s_h
+       The Mutt Next Generation E-Mail Client                                      162
+
+       _6_._4_._3_2_4  _t_r_a_s_h
 
        Type: path
 
@@ -8565,12 +8603,10 @@
        If _s_e_t, this variable specifies the path of the trash folder where the mails
        marked for deletion will be moved, instead of being irremediably purged.
 
-       The Mutt Next Generation E-Mail Client                                      161
-
        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_4  _t_u_n_n_e_l
+       _6_._4_._3_2_5  _t_u_n_n_e_l
 
        Type: string
 
@@ -8585,7 +8621,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_5  _u_m_a_s_k
+       _6_._4_._3_2_6  _u_m_a_s_k
 
        Type: number
 
@@ -8594,7 +8630,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_6  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
+       _6_._4_._3_2_7  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
 
        Type: boolean
 
@@ -8603,32 +8639,35 @@
        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_7  _u_s_e___8_b_i_t_m_i_m_e
+       _6_._4_._3_2_8  _u_s_e___8_b_i_t_m_i_m_e
 
        Type: boolean
 
        Default: no
 
        WWaarrnniinngg:: do not set this variable unless you are using a version of sendmail
-       which supports the -B8BITMIME flag (such as sendmail 8.8.x) or you may not be
-       able to send mail.
+       which supports the -B8BITMIME flag (such as sendmail 8.8.x) or in connection
+       with the SMTP support via libESMTP.  Otherwise you may not be able to send
+
+       The Mutt Next Generation E-Mail Client                                      163
+
+       mail.
 
-       When _s_e_t, Mutt-ng will invoke ``_$_s_e_n_d_m_a_i_l (section 6.4.247  , page 140)'' with
-       the -B8BITMIME flag when sending 8-bit messages to enable ESMTP negotiation.
+       When _s_e_t, Mutt-ng will either invoke ``_$_s_e_n_d_m_a_i_l (section 6.4.247  , page
+       140)'' with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP
+       negotiation or tell libESMTP to do so.
 
-       _6_._4_._3_2_8  _u_s_e___d_o_m_a_i_n
+       _6_._4_._3_2_9  _u_s_e___d_o_m_a_i_n
 
        Type: boolean
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      162
-
        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 100)''.  If _u_n_s_e_t,
+       tion) with the value of ``_$_h_o_s_t_n_a_m_e (section 6.4.89  , page 101)''.  If _u_n_s_e_t,
        no addresses will be qualified.
 
-       _6_._4_._3_2_9  _u_s_e___f_r_o_m
+       _6_._4_._3_3_0  _u_s_e___f_r_o_m
 
        Type: boolean
 
@@ -8638,7 +8677,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_0  _u_s_e___i_d_n
+       _6_._4_._3_3_1  _u_s_e___i_d_n
 
        Type: boolean
 
@@ -8651,7 +8690,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_1  _u_s_e___i_p_v_6
+       _6_._4_._3_3_2  _u_s_e___i_p_v_6
 
        Type: boolean
 
@@ -8661,16 +8700,18 @@
        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_2  _u_s_e_r___a_g_e_n_t
+       _6_._4_._3_3_3  _u_s_e_r___a_g_e_n_t
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      164
+
        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_3  _v_i_s_u_a_l
+       _6_._4_._3_3_4  _v_i_s_u_a_l
 
        Type: path
 
@@ -8679,9 +8720,7 @@
        Specifies the visual editor to invoke when the _~_v command is given in the
        builtin editor.
 
-       The Mutt Next Generation E-Mail Client                                      163
-
-       _6_._4_._3_3_4  _w_a_i_t___k_e_y
+       _6_._4_._3_3_5  _w_a_i_t___k_e_y
 
        Type: boolean
 
@@ -8697,7 +8736,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_5  _w_e_e_d
+       _6_._4_._3_3_6  _w_e_e_d
 
        Type: boolean
 
@@ -8706,7 +8745,7 @@
        When _s_e_t, Mutt-ng will weed headers when displaying, forwarding, printing, or
        replying to messages.
 
-       _6_._4_._3_3_6  _w_r_a_p___s_e_a_r_c_h
+       _6_._4_._3_3_7  _w_r_a_p___s_e_a_r_c_h
 
        Type: boolean
 
@@ -8717,16 +8756,18 @@
        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_7  _w_r_a_p_m_a_r_g_i_n
+       _6_._4_._3_3_8  _w_r_a_p_m_a_r_g_i_n
 
        Type: number
 
        Default: 0
 
+       The Mutt Next Generation E-Mail Client                                      165
+
        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_8  _w_r_i_t_e___b_c_c
+       _6_._4_._3_3_9  _w_r_i_t_e___b_c_c
 
        Type: boolean
 
@@ -8735,9 +8776,7 @@
        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.
 
-       The Mutt Next Generation E-Mail Client                                      164
-
-       _6_._4_._3_3_9  _w_r_i_t_e___i_n_c
+       _6_._4_._3_4_0  _w_r_i_t_e___i_n_c
 
        Type: number
 
@@ -8749,23 +8788,23 @@
 
        Also see the ``_$_r_e_a_d___i_n_c (section 6.4.226  , page 135)'' variable.
 
-       _6_._4_._3_4_0  _x_t_e_r_m___i_c_o_n
+       _6_._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.342  , page 163) 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.307  , page 154)''.
+       tion 6.4.343  , page 164) 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 155)''.
 
-       _6_._4_._3_4_1  _x_t_e_r_m___l_e_a_v_e
+       _6_._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.342  , page 163) is _s_e_t, this string will be
+       If _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 6.4.343  , page 164) 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.
@@ -8775,28 +8814,28 @@
        set xterm_leave = '`test x$DISPLAY != x && xprop -id $WINDOWID | grep WM_NAME |
        cut -d ''' -f 2`'
 
-       _6_._4_._3_4_2  _x_t_e_r_m___s_e_t___t_i_t_l_e_s
+       _6_._4_._3_4_3  _x_t_e_r_m___s_e_t___t_i_t_l_e_s
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      166
+
        Default: no
 
        Controls whether Mutt-ng sets the xterm title bar and icon name (as long as
        you're in an appropriate terminal). The default must be _u_n_s_e_t to force in the
        validity checking.
 
-       _6_._4_._3_4_3  _x_t_e_r_m___t_i_t_l_e
+       _6_._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]?'
 
-       The Mutt Next Generation E-Mail Client                                      165
-
        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.342  , page 163) 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.307  ,
-       page 154)''.
+       _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 6.4.343  , page 164) 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 155)''.
 
        _6_._5  _F_u_n_c_t_i_o_n_s
 
@@ -8812,6 +8851,8 @@
        tings for this menu will affect the default bindings for all menus (except as
        noted).
 
+       The Mutt Next Generation E-Mail Client                                      167
+
             bottom-page                L   move to the bottom of the page
             current-bottom     not bound   move current entry to bottom of page
             current-middle     not bound   move current entry to middle of page
@@ -8844,11 +8885,9 @@
             top-page                   H   move to the top of the page
             what-key           not bound   display the keycode for a key press
 
-       The Mutt Next Generation E-Mail Client                                      166
-
        _6_._5_._2  _i_n_d_e_x
 
-       The Mutt Next Generation E-Mail Client                                      167
+       The Mutt Next Generation E-Mail Client                                      168
 
             bounce-message             b   remail a message to another user
             change-folder              c   open a different folder
@@ -8905,7 +8944,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                                      168
+       The Mutt Next Generation E-Mail Client                                      169
 
             sort-mailbox               o   sort messages
             sort-reverse               O   sort messages in reverse order
@@ -8923,7 +8962,7 @@
 
        _6_._5_._3  _p_a_g_e_r
 
-       The Mutt Next Generation E-Mail Client                                      169
+       The Mutt Next Generation E-Mail Client                                      170
 
             bottom             not bound   jump to the bottom of the message
             bounce-message             b   remail a message to another user
@@ -8980,7 +9019,7 @@
             recall-message             R   recall a postponed message
             redraw-screen             ^L   clear and redraw the screen
 
-       The Mutt Next Generation E-Mail Client                                      170
+       The Mutt Next Generation E-Mail Client                                      171
 
             reply                      r   reply to a message
             save-message               s   save message/attachment to a file
@@ -9020,7 +9059,7 @@
 
        _6_._5_._6  _a_t_t_a_c_h
 
-       The Mutt Next Generation E-Mail Client                                      171
+       The Mutt Next Generation E-Mail Client                                      172
 
             bounce-message             b   remail a message to another user
             collapse-parts             v   toggle display of subparts
@@ -9043,7 +9082,7 @@
 
        _6_._5_._7  _c_o_m_p_o_s_e
 
-       The Mutt Next Generation E-Mail Client                                      172
+       The Mutt Next Generation E-Mail Client                                      173
 
             attach-file                a   attach a file(s) to this message
             attach-message             A   attach message(s) to this message
@@ -9086,7 +9125,7 @@
 
        _6_._5_._9  _b_r_o_w_s_e_r
 
-       The Mutt Next Generation E-Mail Client                                      173
+       The Mutt Next Generation E-Mail Client                                      174
 
             change-dir                 c   change directories
             check-new                TAB   check mailboxes for new mail
@@ -9135,7 +9174,7 @@
 
        _7_.  _M_i_s_c_e_l_l_a_n_y
 
-       The Mutt Next Generation E-Mail Client                                      174
+       The Mutt Next Generation E-Mail Client                                      175
 
        _7_._1  _A_c_k_n_o_w_l_e_d_g_m_e_n_t_s
 
@@ -9192,7 +9231,7 @@
 
        Felix von Leitner (a.k.a ``Fefe'') <leitner@math.fu-berlin.de>,
 
-       The Mutt Next Generation E-Mail Client                                      175
+       The Mutt Next Generation E-Mail Client                                      176
 
        Brandon Long <blong@fiction.net>,
 
@@ -9248,14 +9287,14 @@
 
        Elimar Riesebieter <riesebie@lxtec.de>
 
-       The Mutt Next Generation E-Mail Client                                      176
+       The Mutt Next Generation E-Mail Client                                      177
 
        _7_._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                                      177
+       The Mutt Next Generation E-Mail Client                                      178
 
                                           CONTENTS
 
@@ -9361,32 +9400,32 @@
                  4.11.1   Linking threads   59
                  4.11.2   Breaking threads   59
            4.12  Delivery Status Notification (DSN) Support   ..................... 59
-           4.13  POP3 Support (OPTIONAL)   ........................................ 59
+           4.13  POP3 Support (OPTIONAL)   ........................................ 60
            4.14  IMAP Support (OPTIONAL)   ........................................ 60
                  4.14.1   The Folder Browser   61
 
                                               ii
 
-                 4.14.2   Authentication   61
+                 4.14.2   Authentication   62
            4.15  NNTP Support (OPTIONAL)   ........................................ 62
                  4.15.1   Again: Scoring       62
            4.16  SMTP Support (OPTIONAL)   ........................................ 63
-           4.17  Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)   ............ 63
+           4.17  Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)   ............ 64
            4.18  Start a WWW Browser on URLs (EXTERNAL)   ......................... 64
            4.19  Compressed folders Support (OPTIONAL)   .......................... 64
                  4.19.1   Open a compressed mailbox for reading   65
-                 4.19.2   Write a compressed mailbox   65
+                 4.19.2   Write a compressed mailbox   66
                  4.19.3   Append a message to a compressed mailbox   66
-                 4.19.4   Encrypted folders   66
+                 4.19.4   Encrypted folders   67
 
        5.  Mutt-ng's MIME Support   ............................................... 67
            5.1   Using MIME in Mutt   ............................................. 67
                  5.1.1    Viewing MIME messages in the pager   67
-                 5.1.2    The Attachment Menu   67
+                 5.1.2    The Attachment Menu   68
                  5.1.3    The Compose Menu   68
-           5.2   MIME Type configuration with mime.types   ........................ 68
+           5.2   MIME Type configuration with mime.types   ........................ 69
            5.3   MIME Viewer configuration with mailcap   ......................... 69
-                 5.3.1    The Basics of the mailcap file   69
+                 5.3.1    The Basics of the mailcap file   70
                  5.3.2    Secure use of mailcap   71
                  5.3.3    Advanced mailcap Usage   71
                  5.3.4    Example mailcap files   74
@@ -9397,388 +9436,389 @@
        6.  Reference   ............................................................ 77
            6.1   Command line options   ........................................... 77
            6.2   Patterns   ....................................................... 78
-           6.3   Configuration Commands   ......................................... 79
-           6.4   Configuration variables .......................................... 81
-                 6.4.1    abort_nosubject   81
-                 6.4.2    abort_unmodified   81
-                 6.4.3    alias_file   81
-                 6.4.4    alias_format   81
-                 6.4.5    allow_8bit   82
-                 6.4.6    allow_ansi   82
-                 6.4.7    arrow_cursor   82
+           6.3   Configuration Commands   ......................................... 80
+           6.4   Configuration variables .......................................... 82
+                 6.4.1    abort_nosubject   82
+                 6.4.2    abort_unmodified   82
+                 6.4.3    alias_file   82
+                 6.4.4    alias_format   82
+                 6.4.5    allow_8bit   83
+                 6.4.6    allow_ansi   83
+                 6.4.7    arrow_cursor   83
                  6.4.8    ascii_chars   83
-                 6.4.9    askbcc   83
-                 6.4.10   askcc   83
-                 6.4.11   assumed_charset   83
-                 6.4.12   attach_format   83
-                 6.4.13   attach_sep   84
+                 6.4.9    askbcc   84
+                 6.4.10   askcc   84
+                 6.4.11   assumed_charset   84
+                 6.4.12   attach_format   84
+                 6.4.13   attach_sep   85
                  6.4.14   attach_split   85
-                 6.4.15   attribution   85
-                 6.4.16   auto_tag   85
-                 6.4.17   autoedit   85
-                 6.4.18   beep   85
+                 6.4.15   attribution   86
+                 6.4.16   auto_tag   86
+                 6.4.17   autoedit   86
+                 6.4.18   beep   86
                  6.4.19   beep_new   86
-                 6.4.20   bounce   86
-                 6.4.21   bounce_delivered   86
+                 6.4.20   bounce   87
+                 6.4.21   bounce_delivered   87
 
                                              iii
 
-                 6.4.22   braille_friendly   86
-                 6.4.23   certificate_file   86
-                 6.4.24   charset   87
-                 6.4.25   check_new   87
-                 6.4.26   collapse_unread   87
-                 6.4.27   compose_format   87
-                 6.4.28   config_charset   88
-                 6.4.29   confirmappend   88
-                 6.4.30   confirmcreate   88
-                 6.4.31   connect_timeout   88
-                 6.4.32   content_type   88
+                 6.4.22   braille_friendly   87
+                 6.4.23   certificate_file   87
+                 6.4.24   charset   88
+                 6.4.25   check_new   88
+                 6.4.26   collapse_unread   88
+                 6.4.27   compose_format   88
+                 6.4.28   config_charset   89
+                 6.4.29   confirmappend   89
+                 6.4.30   confirmcreate   89
+                 6.4.31   connect_timeout   89
+                 6.4.32   content_type   89
                  6.4.33   copy   89
-                 6.4.34   crypt_autoencrypt   89
-                 6.4.35   crypt_autopgp   89
-                 6.4.36   crypt_autosign   89
+                 6.4.34   crypt_autoencrypt   90
+                 6.4.35   crypt_autopgp   90
+                 6.4.36   crypt_autosign   90
                  6.4.37   crypt_autosmime   90
-                 6.4.38   crypt_replyencrypt   90
-                 6.4.39   crypt_replysign   90
-                 6.4.40   crypt_replysignencrypted   90
-                 6.4.41   crypt_timestamp   90
+                 6.4.38   crypt_replyencrypt   91
+                 6.4.39   crypt_replysign   91
+                 6.4.40   crypt_replysignencrypted   91
+                 6.4.41   crypt_timestamp   91
                  6.4.42   crypt_use_gpgme   91
-                 6.4.43   crypt_verify_sig   91
-                 6.4.44   date_format   91
-                 6.4.45   default_hook   91
+                 6.4.43   crypt_verify_sig   92
+                 6.4.44   date_format   92
+                 6.4.45   default_hook   92
                  6.4.46   delete   92
-                 6.4.47   delete_untag   92
-                 6.4.48   digest_collapse   92
-                 6.4.49   display_filter   92
-                 6.4.50   dotlock_program   92
+                 6.4.47   delete_untag   93
+                 6.4.48   digest_collapse   93
+                 6.4.49   display_filter   93
+                 6.4.50   dotlock_program   93
                  6.4.51   dsn_notify   93
-                 6.4.52   dsn_return   93
-                 6.4.53   duplicate_threads   93
-                 6.4.54   edit_headers   93
-                 6.4.55   editor   93
+                 6.4.52   dsn_return   94
+                 6.4.53   duplicate_threads   94
+                 6.4.54   edit_headers   94
+                 6.4.55   editor   94
                  6.4.56   encode_from   94
-                 6.4.57   entropy_file   94
-                 6.4.58   envelope_from   94
-                 6.4.59   escape   94
-                 6.4.60   fast_reply   94
+                 6.4.57   entropy_file   95
+                 6.4.58   envelope_from   95
+                 6.4.59   escape   95
+                 6.4.60   fast_reply   95
                  6.4.61   fcc_attach   95
-                 6.4.62   fcc_clear   95
-                 6.4.63   file_charset   95
-                 6.4.64   folder   95
+                 6.4.62   fcc_clear   96
+                 6.4.63   file_charset   96
+                 6.4.64   folder   96
                  6.4.65   folder_format   96
-                 6.4.66   followup_to   96
-                 6.4.67   force_buffy_check   97
-                 6.4.68   force_name   97
-                 6.4.69   forward_decode   97
-                 6.4.70   forward_decrypt   97
+                 6.4.66   followup_to   97
+                 6.4.67   force_buffy_check   98
+                 6.4.68   force_name   98
+                 6.4.69   forward_decode   98
+                 6.4.70   forward_decrypt   98
                  6.4.71   forward_edit   98
-                 6.4.72   forward_format   98
-                 6.4.73   forward_quote   98
-                 6.4.74   from   98
+                 6.4.72   forward_format   99
+                 6.4.73   forward_quote   99
+                 6.4.74   from   99
 
                                               iv
 
-                 6.4.75   gecos_mask   98
-                 6.4.76   hdrs   99
-                 6.4.77   header   99
-                 6.4.78   header_cache   99
+                 6.4.75   gecos_mask   99
+                 6.4.76   hdrs   100
+                 6.4.77   header   100
+                 6.4.78   header_cache   100
                  6.4.79   header_cache_compress   100
                  6.4.80   help   100
-                 6.4.81   hidden_host   100
-                 6.4.82   hide_limited   100
-                 6.4.83   hide_missing   100
+                 6.4.81   hidden_host   101
+                 6.4.82   hide_limited   101
+                 6.4.83   hide_missing   101
                  6.4.84   hide_thread_subject   101
                  6.4.85   hide_top_limited   101
-                 6.4.86   hide_top_missing   101
-                 6.4.87   history   101
-                 6.4.88   honor_followup_to   101
-                 6.4.89   hostname   101
+                 6.4.86   hide_top_missing   102
+                 6.4.87   history   102
+                 6.4.88   honor_followup_to   102
+                 6.4.89   hostname   102
                  6.4.90   ignore_list_reply_to   102
-                 6.4.91   imap_authenticators   102
-                 6.4.92   imap_check_subscribed   102
-                 6.4.93   imap_delim_chars   102
+                 6.4.91   imap_authenticators   103
+                 6.4.92   imap_check_subscribed   103
+                 6.4.93   imap_delim_chars   103
                  6.4.94   imap_headers   103
-                 6.4.95   imap_home_namespace   103
-                 6.4.96   imap_keepalive   103
+                 6.4.95   imap_home_namespace   104
+                 6.4.96   imap_keepalive   104
                  6.4.97   imap_list_subscribed   104
-                 6.4.98   imap_login   104
-                 6.4.99   imap_mail_check   104
-                 6.4.100  imap_pass   104
+                 6.4.98   imap_login   105
+                 6.4.99   imap_mail_check   105
+                 6.4.100  imap_pass   105
                  6.4.101  imap_passive   105
                  6.4.102  imap_peek   105
-                 6.4.103  imap_reconnect   105
-                 6.4.104  imap_servernoise   105
-                 6.4.105  imap_user   105
+                 6.4.103  imap_reconnect   106
+                 6.4.104  imap_servernoise   106
+                 6.4.105  imap_user   106
                  6.4.106  implicit_autoview   106
-                 6.4.107  include   106
-                 6.4.108  include_onlyfirst   106
-                 6.4.109  indent_string   106
-                 6.4.110  index_format   106
-                 6.4.111  ispell   109
-                 6.4.112  keep_flagged   109
-                 6.4.113  list_reply   109
+                 6.4.107  include   107
+                 6.4.108  include_onlyfirst   107
+                 6.4.109  indent_string   107
+                 6.4.110  index_format   107
+                 6.4.111  ispell   110
+                 6.4.112  keep_flagged   110
+                 6.4.113  list_reply   110
                  6.4.114  locale   110
-                 6.4.115  mail_check   110
-                 6.4.116  mailcap_path   110
-                 6.4.117  mailcap_sanitize   110
-                 6.4.118  maildir_header_cache_verify   110
+                 6.4.115  mail_check   111
+                 6.4.116  mailcap_path   111
+                 6.4.117  mailcap_sanitize   111
+                 6.4.118  maildir_header_cache_verify   111
                  6.4.119  maildir_trash   111
-                 6.4.120  mark_old   111
-                 6.4.121  markers   111
-                 6.4.122  mask   111
+                 6.4.120  mark_old   112
+                 6.4.121  markers   112
+                 6.4.122  mask   112
                  6.4.123  max_line_length   112
                  6.4.124  mbox   112
-                 6.4.125  mbox_type   112
-                 6.4.126  menu_context   112
-                 6.4.127  menu_move_off   112
+                 6.4.125  mbox_type   113
+                 6.4.126  menu_context   113
+                 6.4.127  menu_move_off   113
 
                                               v
 
-                 6.4.128  menu_scroll   112
+                 6.4.128  menu_scroll   113
                  6.4.129  message_format   113
-                 6.4.130  meta_key   113
-                 6.4.131  metoo   113
-                 6.4.132  mh_purge   113
-                 6.4.133  mh_seq_flagged   113
+                 6.4.130  meta_key   114
+                 6.4.131  metoo   114
+                 6.4.132  mh_purge   114
+                 6.4.133  mh_seq_flagged   114
                  6.4.134  mh_seq_replied   114
                  6.4.135  mh_seq_unseen   114
-                 6.4.136  mime_forward   114
-                 6.4.137  mime_forward_decode   114
-                 6.4.138  mime_forward_rest   114
-                 6.4.139  mix_entry_format   114
-                 6.4.140  mixmaster   115
-                 6.4.141  move   115
-                 6.4.142  msgid_format   115
-                 6.4.143  narrow_tree   116
+                 6.4.136  mime_forward   115
+                 6.4.137  mime_forward_decode   115
+                 6.4.138  mime_forward_rest   115
+                 6.4.139  mix_entry_format   115
+                 6.4.140  mixmaster   116
+                 6.4.141  move   116
+                 6.4.142  msgid_format   116
+                 6.4.143  narrow_tree   117
                  6.4.144  nntp_ask_followup_to   117
                  6.4.145  nntp_ask_x_comment_to   117
-                 6.4.146  nntp_cache_dir   117
-                 6.4.147  nntp_catchup   117
-                 6.4.148  nntp_context   117
+                 6.4.146  nntp_cache_dir   118
+                 6.4.147  nntp_catchup   118
+                 6.4.148  nntp_context   118
                  6.4.149  nntp_followup_to_poster   118
-                 6.4.150  nntp_group_index_format   118
-                 6.4.151  nntp_host   118
+                 6.4.150  nntp_group_index_format   119
+                 6.4.151  nntp_host   119
                  6.4.152  nntp_inews   119
-                 6.4.153  nntp_load_description   119
-                 6.4.154  nntp_mail_check   119
+                 6.4.153  nntp_load_description   120
+                 6.4.154  nntp_mail_check   120
                  6.4.155  nntp_mime_subject   120
                  6.4.156  nntp_newsrc   120
-                 6.4.157  nntp_pass   120
-                 6.4.158  nntp_post_moderated   120
+                 6.4.157  nntp_pass   121
+                 6.4.158  nntp_post_moderated   121
                  6.4.159  nntp_reconnect   121
-                 6.4.160  nntp_save_unsubscribed   121
-                 6.4.161  nntp_show_new_news   121
-                 6.4.162  nntp_show_only_unread   121
-                 6.4.163  nntp_user   121
+                 6.4.160  nntp_save_unsubscribed   122
+                 6.4.161  nntp_show_new_news   122
+                 6.4.162  nntp_show_only_unread   122
+                 6.4.163  nntp_user   122
                  6.4.164  nntp_x_comment_to   122
-                 6.4.165  operating_system   122
-                 6.4.166  pager   122
-                 6.4.167  pager_context   122
+                 6.4.165  operating_system   123
+                 6.4.166  pager   123
+                 6.4.167  pager_context   123
                  6.4.168  pager_format   123
                  6.4.169  pager_index_lines   123
-                 6.4.170  pager_stop   123
-                 6.4.171  pgp_auto_decode   123
-                 6.4.172  pgp_autoinline   123
-                 6.4.173  pgp_check_exit   124
-                 6.4.174  pgp_clearsign_command   124
-                 6.4.175  pgp_decode_command   124
+                 6.4.170  pager_stop   124
+                 6.4.171  pgp_auto_decode   124
+                 6.4.172  pgp_autoinline   124
+                 6.4.173  pgp_check_exit   125
+                 6.4.174  pgp_clearsign_command   125
+                 6.4.175  pgp_decode_command   125
                  6.4.176  pgp_decrypt_command   125
-                 6.4.177  pgp_encrypt_only_command   125
-                 6.4.178  pgp_encrypt_sign_command   125
-                 6.4.179  pgp_entry_format   125
-                 6.4.180  pgp_export_command   126
+                 6.4.177  pgp_encrypt_only_command   126
+                 6.4.178  pgp_encrypt_sign_command   126
+                 6.4.179  pgp_entry_format   126
+                 6.4.180  pgp_export_command   127
 
                                               vi
 
-                 6.4.181  pgp_getkeys_command   126
-                 6.4.182  pgp_good_sign   126
-                 6.4.183  pgp_ignore_subkeys   126
+                 6.4.181  pgp_getkeys_command   127
+                 6.4.182  pgp_good_sign   127
+                 6.4.183  pgp_ignore_subkeys   127
                  6.4.184  pgp_import_command   127
-                 6.4.185  pgp_list_pubring_command   127
-                 6.4.186  pgp_list_secring_command   127
-                 6.4.187  pgp_long_ids   127
-                 6.4.188  pgp_mime_auto   127
+                 6.4.185  pgp_list_pubring_command   128
+                 6.4.186  pgp_list_secring_command   128
+                 6.4.187  pgp_long_ids   128
+                 6.4.188  pgp_mime_auto   128
                  6.4.189  pgp_replyinline   128
-                 6.4.190  pgp_retainable_sigs   128
-                 6.4.191  pgp_show_unusable   128
-                 6.4.192  pgp_sign_as   128
+                 6.4.190  pgp_retainable_sigs   129
+                 6.4.191  pgp_show_unusable   129
+                 6.4.192  pgp_sign_as   129
                  6.4.193  pgp_sign_command   129
-                 6.4.194  pgp_sort_keys   129
-                 6.4.195  pgp_strict_enc   129
-                 6.4.196  pgp_timeout   129
+                 6.4.194  pgp_sort_keys   130
+                 6.4.195  pgp_strict_enc   130
+                 6.4.196  pgp_timeout   130
                  6.4.197  pgp_use_gpg_agent   130
-                 6.4.198  pgp_verify_command   130
-                 6.4.199  pgp_verify_key_command   130
-                 6.4.200  pipe_decode   130
-                 6.4.201  pipe_sep   130
-                 6.4.202  pipe_split   130
+                 6.4.198  pgp_verify_command   131
+                 6.4.199  pgp_verify_key_command   131
+                 6.4.200  pipe_decode   131
+                 6.4.201  pipe_sep   131
+                 6.4.202  pipe_split   131
                  6.4.203  pop_auth_try_all   131
-                 6.4.204  pop_authenticators   131
-                 6.4.205  pop_delete   131
-                 6.4.206  pop_host   131
-                 6.4.207  pop_last   132
-                 6.4.208  pop_mail_check   132
-                 6.4.209  pop_pass   132
-                 6.4.210  pop_reconnect   132
+                 6.4.204  pop_authenticators   132
+                 6.4.205  pop_delete   132
+                 6.4.206  pop_host   132
+                 6.4.207  pop_last   133
+                 6.4.208  pop_mail_check   133
+                 6.4.209  pop_pass   133
+                 6.4.210  pop_reconnect   133
                  6.4.211  pop_user   133
-                 6.4.212  post_indent_string   133
-                 6.4.213  postpone   133
-                 6.4.214  postponed   133
-                 6.4.215  preconnect   133
-                 6.4.216  print   134
-                 6.4.217  print_command   134
-                 6.4.218  print_decode   134
-                 6.4.219  print_split   134
+                 6.4.212  post_indent_string   134
+                 6.4.213  postpone   134
+                 6.4.214  postponed   134
+                 6.4.215  preconnect   134
+                 6.4.216  print   135
+                 6.4.217  print_command   135
+                 6.4.218  print_decode   135
+                 6.4.219  print_split   135
                  6.4.220  prompt_after   135
-                 6.4.221  query_command   135
-                 6.4.222  quit   135
-                 6.4.223  quote_empty   135
-                 6.4.224  quote_quoted   135
+                 6.4.221  query_command   136
+                 6.4.222  quit   136
+                 6.4.223  quote_empty   136
+                 6.4.224  quote_quoted   136
                  6.4.225  quote_regexp   136
-                 6.4.226  read_inc   136
-                 6.4.227  read_only   136
-                 6.4.228  realname   136
-                 6.4.229  recall   136
+                 6.4.226  read_inc   137
+                 6.4.227  read_only   137
+                 6.4.228  realname   137
+                 6.4.229  recall   137
                  6.4.230  record   137
-                 6.4.231  reply_regexp   137
-                 6.4.232  reply_self   137
-                 6.4.233  reply_to   137
+                 6.4.231  reply_regexp   138
+                 6.4.232  reply_self   138
+                 6.4.233  reply_to   138
 
                                              vii
 
                  6.4.234  resolve   138
-                 6.4.235  reverse_alias   138
-                 6.4.236  reverse_name   138
-                 6.4.237  reverse_realname   138
+                 6.4.235  reverse_alias   139
+                 6.4.236  reverse_name   139
+                 6.4.237  reverse_realname   139
                  6.4.238  rfc2047_parameters   139
-                 6.4.239  save_address   139
-                 6.4.240  save_empty   139
-                 6.4.241  save_name   139
-                 6.4.242  score   140
-                 6.4.243  score_threshold_delete   140
-                 6.4.244  score_threshold_flag   140
-                 6.4.245  score_threshold_read   140
-                 6.4.246  send_charset   140
-                 6.4.247  sendmail   141
-                 6.4.248  sendmail_wait   141
-                 6.4.249  shell   141
+                 6.4.239  save_address   140
+                 6.4.240  save_empty   140
+                 6.4.241  save_name   140
+                 6.4.242  score   141
+                 6.4.243  score_threshold_delete   141
+                 6.4.244  score_threshold_flag   141
+                 6.4.245  score_threshold_read   141
+                 6.4.246  send_charset   141
+                 6.4.247  sendmail   142
+                 6.4.248  sendmail_wait   142
+                 6.4.249  shell   142
                  6.4.250  sidebar_boundary   142
-                 6.4.251  sidebar_delim   142
-                 6.4.252  sidebar_newmail_only   142
-                 6.4.253  sidebar_number_format   142
-                 6.4.254  sidebar_shorten_hierarchy   143
-                 6.4.255  sidebar_visible   143
-                 6.4.256  sidebar_width   143
-                 6.4.257  sig_dashes   143
+                 6.4.251  sidebar_delim   143
+                 6.4.252  sidebar_newmail_only   143
+                 6.4.253  sidebar_number_format   143
+                 6.4.254  sidebar_shorten_hierarchy   144
+                 6.4.255  sidebar_visible   144
+                 6.4.256  sidebar_width   144
+                 6.4.257  sig_dashes   144
                  6.4.258  sig_on_top   144
-                 6.4.259  signature   144
-                 6.4.260  signoff_string   144
-                 6.4.261  simple_search   144
+                 6.4.259  signature   145
+                 6.4.260  signoff_string   145
+                 6.4.261  simple_search   145
                  6.4.262  sleep_time   145
-                 6.4.263  smart_wrap   145
-                 6.4.264  smileys   145
-                 6.4.265  smime_ask_cert_label   145
-                 6.4.266  smime_ca_location   145
-                 6.4.267  smime_certificates   145
-                 6.4.268  smime_decrypt_command   146
-                 6.4.269  smime_decrypt_use_default_key   146
+                 6.4.263  smart_wrap   146
+                 6.4.264  smileys   146
+                 6.4.265  smime_ask_cert_label   146
+                 6.4.266  smime_ca_location   146
+                 6.4.267  smime_certificates   146
+                 6.4.268  smime_decrypt_command   147
+                 6.4.269  smime_decrypt_use_default_key   147
                  6.4.270  smime_default_key   147
-                 6.4.271  smime_encrypt_command   147
-                 6.4.272  smime_encrypt_with   147
-                 6.4.273  smime_get_cert_command   147
-                 6.4.274  smime_get_cert_email_command   147
-                 6.4.275  smime_get_signer_cert_command   147
-                 6.4.276  smime_import_cert_command   148
-                 6.4.277  smime_is_default   148
-                 6.4.278  smime_keys   148
-                 6.4.279  smime_pk7out_command   148
+                 6.4.271  smime_encrypt_command   148
+                 6.4.272  smime_encrypt_with   148
+                 6.4.273  smime_get_cert_command   148
+                 6.4.274  smime_get_cert_email_command   148
+                 6.4.275  smime_get_signer_cert_command   148
+                 6.4.276  smime_import_cert_command   149
+                 6.4.277  smime_is_default   149
+                 6.4.278  smime_keys   149
+                 6.4.279  smime_pk7out_command   149
                  6.4.280  smime_sign_command   149
-                 6.4.281  smime_sign_opaque_command   149
-                 6.4.282  smime_timeout   149
-                 6.4.283  smime_verify_command   149
-                 6.4.284  smime_verify_opaque_command   149
-                 6.4.285  smtp_host   149
-                 6.4.286  smtp_pass   150
+                 6.4.281  smime_sign_opaque_command   150
+                 6.4.282  smime_timeout   150
+                 6.4.283  smime_verify_command   150
+                 6.4.284  smime_verify_opaque_command   150
+                 6.4.285  smtp_envelope   150
+                 6.4.286  smtp_host   150
 
                                              viii
 
-                 6.4.287  smtp_port   150
-                 6.4.288  smtp_use_tls   150
-                 6.4.289  smtp_user   150
-                 6.4.290  sort   151
-                 6.4.291  sort_alias   151
-                 6.4.292  sort_aux   151
-                 6.4.293  sort_browser   152
-                 6.4.294  sort_re   152
-                 6.4.295  spam_separator   152
-                 6.4.296  spoolfile   153
-                 6.4.297  ssl_ca_certificates_file   153
-                 6.4.298  ssl_client_cert   153
-                 6.4.299  ssl_force_tls   153
-                 6.4.300  ssl_min_dh_prime_bits   153
-                 6.4.301  ssl_starttls   154
-                 6.4.302  ssl_use_sslv2   154
-                 6.4.303  ssl_use_sslv3   154
-                 6.4.304  ssl_use_tlsv1   154
-                 6.4.305  ssl_usesystemcerts   154
-                 6.4.306  status_chars   155
-                 6.4.307  status_format   155
-                 6.4.308  status_on_top   157
-                 6.4.309  strict_mailto   157
-                 6.4.310  strict_mime   158
-                 6.4.311  strict_threads   158
-                 6.4.312  strip_was   158
-                 6.4.313  strip_was_regex   158
-                 6.4.314  stuff_quoted   159
-                 6.4.315  suspend   159
-                 6.4.316  text_flowed   159
-                 6.4.317  thorough_search   159
-                 6.4.318  thread_received   159
-                 6.4.319  tilde   160
-                 6.4.320  timeout   160
-                 6.4.321  tmpdir   160
-                 6.4.322  to_chars   160
-                 6.4.323  trash   160
-                 6.4.324  tunnel   161
-                 6.4.325  umask   161
-                 6.4.326  uncollapse_jump   161
-                 6.4.327  use_8bitmime   161
-                 6.4.328  use_domain   161
-                 6.4.329  use_from   162
-                 6.4.330  use_idn   162
-                 6.4.331  use_ipv6   162
-                 6.4.332  user_agent   162
-                 6.4.333  visual   162
-                 6.4.334  wait_key   163
-                 6.4.335  weed   163
-                 6.4.336  wrap_search   163
-                 6.4.337  wrapmargin   163
-                 6.4.338  write_bcc   163
-                 6.4.339  write_inc   164
+                 6.4.287  smtp_pass   151
+                 6.4.288  smtp_port   151
+                 6.4.289  smtp_use_tls   151
+                 6.4.290  smtp_user   152
+                 6.4.291  sort   152
+                 6.4.292  sort_alias   152
+                 6.4.293  sort_aux   152
+                 6.4.294  sort_browser   153
+                 6.4.295  sort_re   153
+                 6.4.296  spam_separator   154
+                 6.4.297  spoolfile   154
+                 6.4.298  ssl_ca_certificates_file   154
+                 6.4.299  ssl_client_cert   154
+                 6.4.300  ssl_force_tls   154
+                 6.4.301  ssl_min_dh_prime_bits   155
+                 6.4.302  ssl_starttls   155
+                 6.4.303  ssl_use_sslv2   155
+                 6.4.304  ssl_use_sslv3   155
+                 6.4.305  ssl_use_tlsv1   155
+                 6.4.306  ssl_usesystemcerts   156
+                 6.4.307  status_chars   156
+                 6.4.308  status_format   156
+                 6.4.309  status_on_top   158
+                 6.4.310  strict_mailto   159
+                 6.4.311  strict_mime   159
+                 6.4.312  strict_threads   159
+                 6.4.313  strip_was   159
+                 6.4.314  strip_was_regex   160
+                 6.4.315  stuff_quoted   160
+                 6.4.316  suspend   160
+                 6.4.317  text_flowed   160
+                 6.4.318  thorough_search   160
+                 6.4.319  thread_received   161
+                 6.4.320  tilde   161
+                 6.4.321  timeout   161
+                 6.4.322  tmpdir   161
+                 6.4.323  to_chars   161
+                 6.4.324  trash   162
+                 6.4.325  tunnel   162
+                 6.4.326  umask   162
+                 6.4.327  uncollapse_jump   162
+                 6.4.328  use_8bitmime   162
+                 6.4.329  use_domain   163
+                 6.4.330  use_from   163
+                 6.4.331  use_idn   163
+                 6.4.332  use_ipv6   163
+                 6.4.333  user_agent   163
+                 6.4.334  visual   164
+                 6.4.335  wait_key   164
+                 6.4.336  weed   164
+                 6.4.337  wrap_search   164
+                 6.4.338  wrapmargin   164
+                 6.4.339  write_bcc   165
 
                                               ix
 
-                 6.4.340  xterm_icon   164
-                 6.4.341  xterm_leave   164
-                 6.4.342  xterm_set_titles   164
-                 6.4.343  xterm_title   164
-           6.5   Functions ....................................................... 165
-                 6.5.1    generic   165
-                 6.5.2    index   166
-                 6.5.3    pager   168
-                 6.5.4    alias   170
-                 6.5.5    query   170
-                 6.5.6    attach   170
-                 6.5.7    compose   171
-                 6.5.8    postpone   172
-                 6.5.9    browser   172
-                 6.5.10   pgp   173
-                 6.5.11   editor   173
-
-       7.  Miscellany ............................................................ 173
-           7.1   Acknowledgments ................................................. 174
-           7.2   About this document ............................................. 176
+                 6.4.340  write_inc   165
+                 6.4.341  xterm_icon   165
+                 6.4.342  xterm_leave   165
+                 6.4.343  xterm_set_titles   165
+                 6.4.344  xterm_title   166
+           6.5   Functions ....................................................... 166
+                 6.5.1    generic   166
+                 6.5.2    index   167
+                 6.5.3    pager   169
+                 6.5.4    alias   171
+                 6.5.5    query   171
+                 6.5.6    attach   171
+                 6.5.7    compose   172
+                 6.5.8    postpone   173
+                 6.5.9    browser   173
+                 6.5.10   pgp   174
+                 6.5.11   editor   174
+
+       7.  Miscellany ............................................................ 174
+           7.1   Acknowledgments ................................................. 175
+           7.2   About this document ............................................. 177
 
                                               x
 
diff --git a/init.h b/init.h
index f397051..3e53b34 100644
--- a/init.h
+++ b/init.h
@@ -542,7 +542,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** \fBNote:\fP you should not enable this unless you are using Sendmail
-   ** 8.8.x or greater.
+   ** 8.8.x or greater or in connection with the SMTP support via libESMTP.
    ** .pp
    ** This variable sets the request for when notification is returned.  The
    ** string consists of a comma separated list (no spaces!) of one or more
@@ -557,7 +557,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** \fBNote:\fP you should not enable this unless you are using Sendmail
-   ** 8.8.x or greater.
+   ** 8.8.x or greater or in connection with the SMTP support via libESMTP.
    ** .pp
    ** This variable controls how much of your message is returned in DSN
    ** messages.  It may be set to either \fIhdrs\fP to return just the
@@ -2360,7 +2360,7 @@ struct option_t MuttVars[] = {
    ** Availability: SMTP
    **
    ** .pp
-   ** Defines the password to use with SMTP AUTH.  If ``$$smtp_auth_username''
+   ** Defines the password to use with SMTP AUTH.  If ``$$smtp_user''
    ** is set, but this variable is not, you will be prompted for a password
    ** when sending.
    ** .pp
@@ -2368,6 +2368,20 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.  
    */
+  {"smtp_envelope", DT_STR, R_NONE, UL &SmtpEnvFrom, 0},
+  /*
+   ** .pp
+   ** Availability: SMTP
+   **
+   ** .pp
+   ** If this variable is non-empty, it'll be used as the envelope sender. If it's empty
+   ** (the default), the value of the regular \fTFrom:\fP header will be used.
+   **
+   ** .pp
+   ** This may be necessary as some providers don't allow for arbitrary values
+   ** as the envelope sender but only a particular one which may not be the same as the
+   ** user's desired \fTFrom:\fP header.
+   */
   {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, 0},
   /*
    ** .pp
@@ -3500,10 +3514,12 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBWarning:\fP do not set this variable unless you are using a version
    ** of sendmail which supports the \fT-B8BITMIME\fP flag (such as sendmail
-   ** 8.8.x) or you may not be able to send mail.
+   ** 8.8.x) or in connection with the SMTP support via libESMTP.
+   ** Otherwise you may not be able to send mail.
    ** .pp
-   ** When \fIset\fP, Mutt-ng will invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
-   ** flag when sending 8-bit messages to enable ESMTP negotiation.
+   ** When \fIset\fP, Mutt-ng will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
+   ** flag when sending 8-bit messages to enable ESMTP negotiation or tell
+   ** libESMTP to do so.
    */
   {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, 1},
   /*
diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index a0674cd..31a4b8e 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -2,6 +2,10 @@
  * Copyright notice from original mutt:
  * [none]
  *
+ * Parts were written/modified by:
+ * Christian Gall <cg@cgall.de>
+ * Rocco Rutte <pdmef@cs.tu-berlin.de>
+ *
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
@@ -49,6 +53,8 @@ static char authpass[STRING] = "";
     _mutt_libesmtp_perror(msg); \
     FAIL(); \
   } while (0)
+#define extna(msg) { mutt_error (_("SMTP Extension '%s' not supported by MTA."), \
+                                 msg); sleep (1); }
 
 /*
  * _mutt_libesmtp_ensure_init
@@ -177,7 +183,7 @@ static int handle_invalid_peer_certificate (long vfy_result) {
 }
 #endif
 
-void event_cb (smtp_session_t session, int event_no, void *arg,...)
+static void event_cb (smtp_session_t session, int event_no, void *arg,...)
 { 
   va_list alist;
   int *ok;
@@ -226,13 +232,53 @@ void event_cb (smtp_session_t session, int event_no, void *arg,...)
     sleep(1);
     *ok = 1; break;
   }
+  case SMTP_EV_EXTNA_DSN:
+    extna ("DSN");
+    break;
+  case SMTP_EV_EXTNA_STARTTLS:
+    extna ("StartTLS");
+    break;
+  case SMTP_EV_EXTNA_8BITMIME:
+    extna ("8BITMIME");
+    break;
   default:
-    mutt_message(_("Got event: %d - ignored."), event_no);
+    mutt_message(_("Got unhandled event ID = %d - ignored."), event_no);
     sleep(1);
   }
   va_end(alist);
 }
 
+static void do_dsn_notify (smtp_message_t message, const char* from) {
+  int flags = Notify_NOTSET;
+  smtp_recipient_t self = NULL;
+
+  if (!DsnNotify || !*DsnNotify || !message || !from || !*from || 
+      strstr (DsnNotify, "never") != NULL)
+    return;
+
+  if (strstr (DsnNotify, "failure") != NULL)
+    flags |= Notify_FAILURE;
+  if (strstr (DsnNotify, "delay") != NULL)
+    flags |= Notify_DELAY;
+  if (strstr (DsnNotify, "success") != NULL)
+    flags |= Notify_SUCCESS;
+
+  if (flags != Notify_NOTSET) {
+    if (!(self = smtp_add_recipient (message, from)))
+      return;
+    smtp_dsn_set_notify (self, flags);
+  }
+}
+
+static void do_dsn_ret (smtp_message_t message) {
+  if (!DsnReturn || !*DsnReturn || !message)
+    return;
+  if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
+    smtp_dsn_set_ret (message, Ret_HDRS);
+  else if (ascii_strncasecmp (DsnReturn, "full", 4) == 0)
+    smtp_dsn_set_ret (message, Ret_FULL);
+}
+
 /*
  * mutt_invoke_libesmtp
  *   Sends a mail message to the provided recipients using libesmtp.
@@ -252,6 +298,7 @@ int mutt_invoke_libesmtp (ADDRESS * from,       /* the sender */
   FILE *fp = NULL;
   auth_context_t authctx = NULL;
   const smtp_status_t *status;
+  char* envfrom = from->mailbox;
 
   _mutt_libesmtp_ensure_init ();
 
@@ -291,10 +338,21 @@ int mutt_invoke_libesmtp (ADDRESS * from,       /* the sender */
 
   if ((message = smtp_add_message (session)) == NULL)
     SMTPFAIL ("smtp_add_message");
+
   /*  Initialize envelope sender */
-  if (!smtp_set_reverse_path (message, from->mailbox))
+  if (SmtpEnvFrom && *SmtpEnvFrom)
+    envfrom = SmtpEnvFrom;
+  if (!smtp_set_reverse_path (message, envfrom))
     SMTPFAIL ("smtp_set_reverse_path");
 
+  /* set up DSN for message */
+  do_dsn_notify (message, envfrom);
+  do_dsn_ret (message);
+
+  /* set up 8bitmime flag */
+  if (eightbit && option (OPTUSE8BITMIME))
+    smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
+
   if ((fp = fopen (msg, "r")) == NULL)
     LIBCFAIL ("fopen");
   if (!smtp_set_messagecb (message, _mutt_libesmtp_messagefp_cb, fp))
-- 
2.20.1