From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Tue, 23 Aug 2005 01:22:15 +0000 (+0000)
Subject: Rocco Rutte:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=a5b02206150dc653355cdc60286c27482b5a4f93

Rocco Rutte:
- revert removal of $signoff_string as $post_indent_string only works with replies (argh! note to self: switch back to compiling+testing changes; sorry for the noise)


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

diff --git a/UPGRADING b/UPGRADING
index b00bff6..2f0c01f 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -12,10 +12,6 @@ sources of information.
 
 2005-08-22:
 
-  The $signoff_string variable now is a synonym for
-  $post_indent_string which was there first and provides the
-  same functionality.
-
   Reading configurations from ~/.muttngrc-$version and
   ~/.muttng/muttngrc-$version is no longer supported;
   ~/.muttngrc and ~/.muttng/muttngrc remain.
diff --git a/contrib/sample.muttngrc b/contrib/sample.muttngrc
index 1c4b529..ac4c422 100644
--- a/contrib/sample.muttngrc
+++ b/contrib/sample.muttngrc
@@ -399,7 +399,7 @@ unset signature
 
 # Set these string at the bottom of all messages (and about the 
 # signature, if you have one).
-set post_indent_string="Regards,\nAndreas"
+set signoff_string="Regards,\nAndreas"
 
 # First sort messages by threads...
 set sort=threads
diff --git a/contrib/update-config.pl b/contrib/update-config.pl
index c72e7eb..9a57029 100755
--- a/contrib/update-config.pl
+++ b/contrib/update-config.pl
@@ -50,9 +50,7 @@ my %opts = (
   " x_comment_to"                 => " nntp_x_comment_to",
   # libesmtp
   " smtp_auth_username"           => " smtp_user",
-  " smtp_auth_password"           => " smtp_pass",
-  # misc
-  " signoff_string"               => " post_indent_string"
+  " smtp_auth_password"           => " smtp_pass"
 );
 
 if (@ARGV == 0) {
diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 5f2c204..df0ba2e 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -4689,9 +4689,7 @@ The following are the commands understood by mutt.
 <tt><ref id="unhook" name="unhook"></tt> <em/hook-type/
 </itemize>
 
-<!--}}}-->
-
-<sect>Configuration variables<label id="variables"> <!--{{{--> 
+<sect>Configuration variables<label id="variables">
 
 <p>The following list contains all variables which, in the process of
 providing more consistency, have been renamed and are partially even
@@ -4740,7 +4738,6 @@ show_only_unread        nntp_show_only_unread
 x_comment_to            nntp_x_comment_to
 smtp_auth_username      smtp_user
 smtp_auth_password      smtp_pass
-signoff_string          post_indent_string
 </verb></tscreen>
 
 The <tt/contrib/ subdirectory contains a script named
@@ -4750,4 +4747,3 @@ A complete list of current variables follows.
 
 <p>
 
-<!--}}}-->
diff --git a/doc/manual.txt b/doc/manual.txt
index e0078c1..d92203e 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -4,7 +4,7 @@
                       by Andreas Krennmair <ak@synflood.at> and others
                 originally based on _m_u_t_t by Michael Elkins <me@cs.hmc.edu> and others
 
-                                        version devel
+                                     version devel-r408
 
                                           AAbbssttrraacctt
 
@@ -413,7 +413,7 @@
           +o cclleeaarr--ffllaagg (default: W)
 
        Furthermore, the following flags reflect who the message is addressed to.  They
-       can be customized with the _$_t_o___c_h_a_r_s (section 7.4.323  , page 165) variable.
+       can be customized with the _$_t_o___c_h_a_r_s (section 7.4.324  , page 165) variable.
 
              +
                    message is to you and you only
@@ -497,7 +497,7 @@
 
        _2_._5_._3  _T_h_r_e_a_d_e_d _M_o_d_e
 
-       When the mailbox is _s_o_r_t_e_d (section 7.4.291  , page 155) by _t_h_r_e_a_d_s, there are
+       When the mailbox is _s_o_r_t_e_d (section 7.4.292  , page 155) by _t_h_r_e_a_d_s, there are
        a few additional functions available in the _i_n_d_e_x and _p_a_g_e_r modes.
 
             ^D      delete-thread           delete all messages in the current thread
@@ -522,7 +522,7 @@
        _$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111) to optionally display the number of
        hidden messages if the thread is collapsed.
 
-       See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 7.4.312  , page 163).
+       See also: _$_s_t_r_i_c_t___t_h_r_e_a_d_s (section 7.4.313  , page 163).
 
        _2_._5_._4  _M_i_s_c_e_l_l_a_n_e_o_u_s _F_u_n_c_t_i_o_n_s
 
@@ -613,9 +613,9 @@
         (default: |)
 
        Asks for an external Unix command and pipes the current or tagged message(s) to
-       it.  The variables _$_p_i_p_e___d_e_c_o_d_e (section 7.4.201  , page 135), _$_p_i_p_e___s_p_l_i_t
+       it.  The variables _$_p_i_p_e___d_e_c_o_d_e (section 7.4.201  , page 134), _$_p_i_p_e___s_p_l_i_t
        (section 7.4.203  , page 135), _$_p_i_p_e___s_e_p (section 7.4.202  , page 135) and
-       _$_w_a_i_t___k_e_y (section 7.4.335  , page 167) control the exact behavior of this
+       _$_w_a_i_t___k_e_y (section 7.4.336  , page 167) control the exact behavior of this
        function.
 
        rreesseenndd--mmeessssaaggee
@@ -625,7 +625,7 @@
        message.  This function is best described as "recall from arbitrary folders".
        It can conveniently be used to forward MIME messages while preserving the orig-
        inal mail structure. Note that the amount of headers included here depends on
-       the value of the _$_w_e_e_d (section 7.4.336  , page 168) variable.
+       the value of the _$_w_e_e_d (section 7.4.337  , page 168) variable.
 
        This function is also available from the attachment menu. You can use this to
        easily resend a message which was included with a bounce message as a mes-
@@ -635,7 +635,7 @@
         (default: !)
 
        Asks for an external Unix command and executes it.  The _$_w_a_i_t___k_e_y (section
-       7.4.335  , page 167) can be used to control whether Mutt-ng will wait for a key
+       7.4.336  , page 167) can be used to control whether Mutt-ng will wait for a key
        to be pressed when the command returns (presumably to let the user read the
        output of the command), based on the return status of the named command.
 
@@ -755,7 +755,7 @@
        sages from. You can now tag messages in that folder and they will be attached
        to the message you are sending. Note that certain operations like composing a
        new mail, replying, forwarding, etc. are not permitted when you are in that
-       folder. The %r in _$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160) will change to a
+       folder. The %r in _$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.309  , page 160) will change to a
        'A' to indicate that you are in attach-message mode.
 
        The Mutt Next Generation E-Mail Client                                       16
@@ -1019,7 +1019,7 @@
        be in the same folder with the message you replied to for the status of the
        message to be updated.
 
-       See also the _$_p_o_s_t_p_o_n_e (section 7.4.214  , page 138) quad-option.
+       See also the _$_p_o_s_t_p_o_n_e (section 7.4.214  , page 137) quad-option.
 
        _3_.  _C_o_n_f_i_g_u_r_a_t_i_o_n
 
@@ -1299,7 +1299,7 @@
        mailboxes to execute _c_o_m_m_a_n_d before loading.  If a mailbox matches multiple
        folder-hook's, they are executed in the order given in the muttrc.
 
-       NNoottee:: if you use the ``!'' shortcut for _$_s_p_o_o_l_f_i_l_e (section 7.4.297  , page
+       NNoottee:: if you use the ``!'' shortcut for _$_s_p_o_o_l_f_i_l_e (section 7.4.298  , page
        157) at the beginning of the pattern, you must place it inside of double or
        single quotes in order to distinguish it from the logical _n_o_t operator for the
        expression.
@@ -1689,7 +1689,7 @@
        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 7.4.64  , page 100) and _$_s_p_o_o_l_f_i_l_e (section
-       7.4.297  , page 157)) should be executed before the mailboxes command.
+       7.4.298  , page 157)) should be executed before the mailboxes command.
 
        _3_._1_5  _U_s_e_r _d_e_f_i_n_e_d _h_e_a_d_e_r_s
 
@@ -1929,9 +1929,9 @@
 
        These three thresholds can be set via the variables _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___f_l_a_g (sec-
        tion 7.4.245  , page 145), _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.246  , page 145),
-       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.244  , page 145) and.  By default,
+       _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.244  , page 144) and.  By default,
        _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___r_e_a_d (section 7.4.246  , page 145) and _$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
-       (section 7.4.244  , page 145) are set to -1, which means that in the default
+       (section 7.4.244  , page 144) are set to -1, which means that in the default
        threshold configuration no message will ever get marked as read or deleted.
 
        Scoring gets especially interesting when combined with the color command and
@@ -2505,7 +2505,7 @@
           +o the current mutt-ng version number
 
        The setting for the status bar of the index is controlled via the _$_s_t_a_t_u_s___f_o_r_-
-       _m_a_t (section 7.4.308  , page 160) variable. For the hostname and version
+       _m_a_t (section 7.4.309  , page 160) variable. For the hostname and version
        string, there's an expando for $status_format: %h expands to the hostname and
        %v to the version string. When just configuring:
 
@@ -2840,7 +2840,7 @@
        These shortcuts can be used anywhere you are prompted for a file or mailbox
        path.
 
-          +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 7.4.297  , page 157) (incoming)
+          +o ! -- refers to your _$_s_p_o_o_l_f_i_l_e (section 7.4.298  , page 157) (incoming)
             mailbox
 
           +o > -- refers to your _$_m_b_o_x (section 7.4.125  , page 116) file
@@ -2929,7 +2929,7 @@
        ``~y'' selector.  ``X-Label:'' is not a standard message header field, but it
        can easily be inserted by procmail and other mail filtering agents.
 
-       Lastly, Mutt-ng has the ability to _s_o_r_t (section 7.4.291  , page 155) the mail-
+       Lastly, Mutt-ng has the ability to _s_o_r_t (section 7.4.292  , page 155) the mail-
        box into _t_h_r_e_a_d_s (section 2.5.3  , page 11).  A thread is a group of messages
        which all relate to the same subject.  This is usually organized into a tree-
        like structure where a message and all of its replies are represented graphi-
@@ -3008,7 +3008,7 @@
 
        Polling for new mail is more expensive over POP3 than locally. For this reason
        the frequency at which Mutt-ng will check for mail remotely can be controlled
-       by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 7.4.209  , page 137) variable, which defaults
+       by the _$_p_o_p___m_a_i_l___c_h_e_c_k (section 7.4.209  , page 136) variable, which defaults
        to every 60 seconds.
 
        If Mutt-ng was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script with
@@ -3019,7 +3019,7 @@
 
        Another way to access your POP3 mail is the _f_e_t_c_h_-_m_a_i_l function (default: G).
        It allows to connect to _p_o_p___h_o_s_t (section 7.4.207  , page 136), fetch all your
-       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 7.4.297  , page 157).
+       new mail and place it in the local _s_p_o_o_l_f_i_l_e (section 7.4.298  , page 157).
        After this point, Mutt-ng runs exactly as if the mail had always been local.
 
        NNoottee:: If you only need to fetch all messages to local mailbox you should con-
@@ -3066,7 +3066,7 @@
 
        Polling for new mail on an IMAP server can cause noticeable delays. So, you'll
        want to carefully tune the _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section 7.4.99  , page 108) and
-       _$_t_i_m_e_o_u_t (section 7.4.321  , page 164) variables.
+       _$_t_i_m_e_o_u_t (section 7.4.322  , page 164) variables.
 
        Note that if you are using mbox as the mail store on UW servers prior to
        v12.250, the server has been reported to disconnect a client if another client
@@ -3190,25 +3190,25 @@
        muttng -v contains +USE_LIBESMTP, this will be or is the case already. The SMTP
        support includes support for Delivery Status Notification (see _D_e_l_i_v_e_r_y _S_t_a_t_u_s
        _N_o_t_i_f_i_c_a_t_i_o_n (section 4.12  , page 59) section) as well as handling the 8BIT-
-       MIME flag controlled via _$_u_s_e___8_b_i_t_m_i_m_e (section 7.4.328  , page 166).
+       MIME flag controlled via _$_u_s_e___8_b_i_t_m_i_m_e (section 7.4.329  , page 166).
 
        To enable sending mail directly via SMTP without an MTA such as Postfix or
-       SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 7.4.286  , page 154)
+       SSMTP and the like, simply set the _$_s_m_t_p___h_o_s_t (section 7.4.287  , page 154)
        variable pointing to your SMTP server.
 
-       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 7.4.290  ,
-       page 155) and _$_s_m_t_p___p_a_s_s (section 7.4.287  , page 154) variables.
+       Authentication mechanisms are available via the _$_s_m_t_p___u_s_e_r (section 7.4.291  ,
+       page 155) and _$_s_m_t_p___p_a_s_s (section 7.4.288  , page 154) variables.
 
        Transport Encryption via the StartTLS command is also available. For this to
        work, first of all Mutt-ng must be built with SSL or GNUTLS.  Secondly, the
-       _$_s_m_t_p___u_s_e___t_l_s (section 7.4.289  , page 155) variable must be either set to
+       _$_s_m_t_p___u_s_e___t_l_s (section 7.4.290  , page 155) variable must be either set to
        ``enabled'' or ``required.'' In both cases, StartTLS will be used if the server
        supports it: for the second case, the connection will fail if it doesn't while
        switching back to unencrypted communication for the first one.
 
        Some mail providers require user's to set a particular envelope sender, i.e.
        they allow for only one value which may not be what the user wants to send as
-       the From: header. In this case, the variable _$_s_m_t_p___e_n_v_e_l_o_p_e (section 7.4.285  ,
+       the From: header. In this case, the variable _$_s_m_t_p___e_n_v_e_l_o_p_e (section 7.4.286  ,
        page 154) may be used to set the envelope different from the From: header.
 
        _4_._1_7  _M_a_n_a_g_i_n_g _m_u_l_t_i_p_l_e _I_M_A_P_/_P_O_P_/_N_N_T_P _a_c_c_o_u_n_t_s _(_O_P_T_I_O_N_A_L_)
@@ -3632,10 +3632,10 @@
              needsterminal
                    Mutt-ng uses this flag when viewing attachments with _a_u_t_o_v_i_e_w (sec-
                    tion 5.4  , page 75), in order to decide whether it should honor
-                   the setting of the _$_w_a_i_t___k_e_y (section 7.4.335  , page 167) variable
+                   the setting of the _$_w_a_i_t___k_e_y (section 7.4.336  , page 167) variable
                    or not.  When an attachment is viewed using an interactive program,
                    and the corresponding mailcap entry has a _n_e_e_d_s_t_e_r_m_i_n_a_l flag, Mutt-
-                   ng will use _$_w_a_i_t___k_e_y (section 7.4.335  , page 167) and the exit
+                   ng will use _$_w_a_i_t___k_e_y (section 7.4.336  , page 167) and the exit
                    status of the program to decide if it will ask you to press a key
                    after the external program has exited.  In all other situations it
                    will not prompt you for a key.
@@ -3913,10 +3913,10 @@
        _6_._2  _T_e_m_p_o_r_a_r_y _F_i_l_e_s
 
        Mutt-ng uses many temporary files for viewing messages, verifying digital sig-
-       natures, etc. The _$_u_m_a_s_k (section 7.4.326  , page 166) variable can be used to
+       natures, etc. The _$_u_m_a_s_k (section 7.4.327  , page 166) variable can be used to
        change the default permissions of these files. Please only change it if you
        really know what you are doing.  Also, a different location for these files may
-       be desired which can be changed via the _$_t_m_p_d_i_r (section 7.4.322  , page 165)
+       be desired which can be changed via the _$_t_m_p_d_i_r (section 7.4.323  , page 165)
        variable.
 
        The Mutt Next Generation E-Mail Client                                       78
@@ -3950,7 +3950,7 @@
        will send out the user's private gnupg keyring to joe@host if the user doesn't
        follow the information on screen carefully enough.
 
-       When _u_n_s_e_t_t_i_n_g the _$_s_t_r_i_c_t___m_a_i_l_t_o (section 7.4.310  , page 162) variable, mutt-
+       When _u_n_s_e_t_t_i_n_g the _$_s_t_r_i_c_t___m_a_i_l_t_o (section 7.4.311  , page 162) variable, mutt-
        ng will
 
           +o be less strict when interpreting these links by prepending a X-Mailto-
@@ -4282,7 +4282,6 @@
             x_comment_to            nntp_x_comment_to
             smtp_auth_username      smtp_user
             smtp_auth_password      smtp_pass
-            signoff_string          post_indent_string
 
        The contrib subdirectory contains a script named update-config.pl which eases
        migration.
@@ -4295,9 +4294,10 @@
 
        Default: ask-yes
 
+       If set to _y_e_s, when composing messages and no subject is given at the subject
+
        The Mutt Next Generation E-Mail Client                                       86
 
-       If set to _y_e_s, when composing messages and no subject is given at the subject
        prompt, composition will be aborted.  If set to _n_o, composing messages with no
        subject given at the subject prompt will never be aborted.
 
@@ -4351,10 +4351,10 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                       87
-
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                       87
+
        Controls whether 8-bit data is converted to 7-bit using either quoted-printable
        or base64 encoding when sending mail.
 
@@ -4407,11 +4407,10 @@
        Default: no
 
        If _s_e_t, Mutt-ng will prompt you for carbon-copy (Cc) recipients before editing
+       the body of an outgoing message.
 
        The Mutt Next Generation E-Mail Client                                       88
 
-       the body of an outgoing message.
-
        _7_._4_._1_1  _a_s_s_u_m_e_d___c_h_a_r_s_e_t
 
        Type: string
@@ -4429,7 +4428,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 7.4.311  , page 162) is unset.
+       is valid only if _$_s_t_r_i_c_t___m_i_m_e (section 7.4.312  , page 162) is unset.
 
        _7_._4_._1_2  _a_t_t_a_c_h___f_o_r_m_a_t
 
@@ -4464,11 +4463,11 @@
              %m
                    major MIME type
 
-       The Mutt Next Generation E-Mail Client                                       89
-
              %M
                    MIME subtype
 
+       The Mutt Next Generation E-Mail Client                                       89
+
              %n
                    attachment number
 
@@ -4521,10 +4520,10 @@
        reply.  For a full listing of defined printf(3)-like sequences see the section
        on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)''.
 
-       The Mutt Next Generation E-Mail Client                                       90
-
        _7_._4_._1_6  _a_u_t_o___t_a_g
 
+       The Mutt Next Generation E-Mail Client                                       90
+
        Type: boolean
 
        Default: no
@@ -4576,12 +4575,12 @@
        _n_o is not generally useful, and thus not recommended, because you are unable to
        bounce messages.
 
-       The Mutt Next Generation E-Mail Client                                       91
-
        _7_._4_._2_1  _b_o_u_n_c_e___d_e_l_i_v_e_r_e_d
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                       91
+
        Default: yes
 
        When this variable is _s_e_t, Mutt-ng will include Delivered-To: header fields
@@ -4632,12 +4631,13 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                       92
-
        NNoottee:: this option only affects _m_a_i_l_d_i_r and _M_H style mailboxes.
 
        When _s_e_t, Mutt-ng will check for new mail delivered while the mailbox is open.
        Especially with MH mailboxes, this operation can take quite some time since it
+
+       The Mutt Next Generation E-Mail Client                                       92
+
        involves scanning the directory and checking each file to see if it has already
        been looked at.  If it's _u_n_s_e_t, no check for new mail is performed while the
        mailbox is open.
@@ -4658,7 +4658,7 @@
        Default: '-- Mutt-ng: Compose  [Approx. msg size: %l   Atts: %a]%>-'
 
        Controls the format of the status line displayed in the ``compose'' menu.  This
-       string is similar to ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160)'', but has
+       string is similar to ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.309  , page 160)'', but has
        its own set of printf(3)-like sequences:
 
              %a
@@ -4673,7 +4673,7 @@
              %v
                    Mutt-ng version string
 
-       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160)''
+       See the text describing the ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.309  , page 160)''
        option for more information on how to set ``_$_c_o_m_p_o_s_e___f_o_r_m_a_t (section 7.4.27  ,
        page 92)''.
 
@@ -4689,11 +4689,12 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                       93
-
        Default: yes
 
        When _s_e_t, Mutt-ng will prompt for confirmation when appending messages to an
+
+       The Mutt Next Generation E-Mail Client                                       93
+
        existing mailbox.
 
        _7_._4_._3_0  _c_o_n_f_i_r_m_c_r_e_a_t_e
@@ -4733,7 +4734,7 @@
        This variable controls whether or not copies of your outgoing messages will be
        saved for later references.  Also see ``_$_r_e_c_o_r_d (section 7.4.231  , page
        141)'', ``_$_s_a_v_e___n_a_m_e (section 7.4.242  , page 144)'', ``_$_f_o_r_c_e___n_a_m_e (section
-       7.4.68  , page 102)'' and ``_f_c_c_-_h_o_o_k (section 3.18  , page 35)''.
+       7.4.68  , page 101)'' and ``_f_c_c_-_h_o_o_k (section 3.18  , page 35)''.
 
        _7_._4_._3_4  _c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t
 
@@ -4745,13 +4746,12 @@
        going messages.  This is probably only useful in connection to the _s_e_n_d_-_h_o_o_k
        command.  It can be overridden by use of the _p_g_p_-_m_e_n_u, when encryption is not
        required or signing is requested as well.  If ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section
-
-       The Mutt Next Generation E-Mail Client                                       94
-
-       7.4.277  , page 152)'' is _s_e_t, then OpenSSL is used instead to create S/MIME
+       7.4.278  , page 152)'' is _s_e_t, then OpenSSL is used instead to create S/MIME
        messages and settings can be overridden by use of the _s_m_i_m_e_-_m_e_n_u.  (Crypto
        only)
 
+       The Mutt Next Generation E-Mail Client                                       94
+
        _7_._4_._3_5  _c_r_y_p_t___a_u_t_o_p_g_p
 
        Type: boolean
@@ -4762,7 +4762,7 @@
        encryption/signing for messages.  See also ``_$_c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t (section
        7.4.34  , page 93)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.38  , page 94)'',
        ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.36  , page 94)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       7.4.39  , page 94)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.277  , page 152)''.
+       7.4.39  , page 94)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.278  , page 152)''.
 
        _7_._4_._3_6  _c_r_y_p_t___a_u_t_o_s_i_g_n
 
@@ -4773,7 +4773,7 @@
        Setting this variable will cause Mutt-ng to always attempt to cryptographically
        sign outgoing messages.  This can be overridden by use of the _p_g_p_-_m_e_n_u, when
        signing is not required or encryption is requested as well. If
-       ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.277  , page 152)'' is _s_e_t, then OpenSSL is
+       ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.278  , page 152)'' is _s_e_t, then OpenSSL is
        used instead to create S/MIME messages and settings can be overridden by use of
        the _s_m_i_m_e_-_m_e_n_u.  (Crypto only)
 
@@ -4787,7 +4787,7 @@
        encryption/signing for messages. See also ``_$_c_r_y_p_t___a_u_t_o_e_n_c_r_y_p_t (section
        7.4.34  , page 93)'', ``_$_c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t (section 7.4.38  , page 94)'',
        ``_$_c_r_y_p_t___a_u_t_o_s_i_g_n (section 7.4.36  , page 94)'', ``_$_c_r_y_p_t___r_e_p_l_y_s_i_g_n (section
-       7.4.39  , page 94)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.277  , page 152)''.
+       7.4.39  , page 94)'' and ``_$_s_m_i_m_e___i_s___d_e_f_a_u_l_t (section 7.4.278  , page 152)''.
 
        _7_._4_._3_8  _c_r_y_p_t___r_e_p_l_y_e_n_c_r_y_p_t
 
@@ -4802,12 +4802,12 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                       95
-
        Default: no
 
        If _s_e_t, automatically PGP or OpenSSL sign replies to messages which are signed.
 
+       The Mutt Next Generation E-Mail Client                                       95
+
        NNoottee:: this does not work on messages that are encrypted aanndd signed!  (Crypto
        only)
 
@@ -4858,12 +4858,12 @@
        whether or not to verify the signature.  If ``_n_o'', never attempt to verify
        cryptographic signatures.  (Crypto only)
 
-       The Mutt Next Generation E-Mail Client                                       96
-
        _7_._4_._4_4  _d_a_t_e___f_o_r_m_a_t
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                       96
+
        Default: '!%a, %b %d, %Y at %I:%M:%S%p %Z'
 
        This variable controls the format of the date printed by the ``%d'' sequence in
@@ -4914,12 +4914,12 @@
 
        _7_._4_._4_8  _d_i_g_e_s_t___c_o_l_l_a_p_s_e
 
-       The Mutt Next Generation E-Mail Client                                       97
-
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                       97
+
        If this option is _s_e_t, Mutt-ng's received-attachments menu will not show the
        subparts of individual messages in a multipart/digest.  To see these subparts,
        press 'v' on that menu.
@@ -4970,12 +4970,12 @@
        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.
 
-       The Mutt Next Generation E-Mail Client                                       98
-
        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
        return the full message.
 
+       The Mutt Next Generation E-Mail Client                                       98
+
        Example: set dsn_return=hdrs
 
        _7_._4_._5_3  _d_u_p_l_i_c_a_t_e___t_h_r_e_a_d_s
@@ -5027,11 +5027,11 @@
 
        Availability: SSL
 
-       The Mutt Next Generation E-Mail Client                                       99
-
        The file which includes random data that is used to initialize SSL library
        functions.
 
+       The Mutt Next Generation E-Mail Client                                       99
+
        _7_._4_._5_8  _e_n_v_e_l_o_p_e___f_r_o_m
 
        Type: boolean
@@ -5083,12 +5083,12 @@
        When this variable is _s_e_t, FCCs will be stored unencrypted and unsigned, even
        when the actual message is encrypted and/or signed.  (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      100
-
        _7_._4_._6_3  _f_i_l_e___c_h_a_r_s_e_t
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      100
+
        Default: ''
 
        This variable is a colon-separated list of character encoding schemes for text
@@ -5138,14 +5138,14 @@
              %g
                    group name (or numeric gid, if missing)
 
-       The Mutt Next Generation E-Mail Client                                      101
-
              %l
                    number of hard links
 
              %N
                    N if folder has new mail, blank otherwise
 
+       The Mutt Next Generation E-Mail Client                                      101
+
              %s
                    size in bytes
 
@@ -5191,18 +5191,18 @@
        is invoked. When _u_n_s_e_t, _b_u_f_f_y___l_i_s_t will just list all mailboxes which are
        already known to have new mail.
 
-       Also see the following variables: ``_$_t_i_m_e_o_u_t (section 7.4.321  , page 164)'',
+       Also see the following variables: ``_$_t_i_m_e_o_u_t (section 7.4.322  , page 164)'',
        ``_$_m_a_i_l___c_h_e_c_k (section 7.4.115  , page 114)'' and ``_$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
        7.4.99  , page 108)''.
 
-       The Mutt Next Generation E-Mail Client                                      102
-
        _7_._4_._6_8  _f_o_r_c_e___n_a_m_e
 
        Type: boolean
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      102
+
        This variable is similar to ``_$_s_a_v_e___n_a_m_e (section 7.4.242  , page 144)'',
        except that Mutt-ng will store a copy of your outgoing message by the username
        of the address you are sending to even if that mailbox does not exist.
@@ -5251,14 +5251,14 @@
        the same format sequences as the ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page
        111)'' variable.
 
-       The Mutt Next Generation E-Mail Client                                      103
-
        _7_._4_._7_3  _f_o_r_w_a_r_d___q_u_o_t_e
 
        Type: boolean
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      103
+
        When _s_e_t forwarded messages included in the main body of the message (when
        ``_$_m_i_m_e___f_o_r_w_a_r_d (section 7.4.137  , page 118)'' is _u_n_s_e_t) will be quoted using
        ``_$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.109  , page 111)''.
@@ -5271,7 +5271,7 @@
 
        This variable contains a default from address.  It can be overridden using
        my_hdr (including from send-hooks) and ``_$_r_e_v_e_r_s_e___n_a_m_e (section 7.4.237  , page
-       143)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 7.4.330  , page
+       143)''.  This variable is ignored if ``_$_u_s_e___f_r_o_m (section 7.4.331  , page
        166)'' is unset.
 
        E.g. you can use send-hook Mutt-ng-devel@lists.berlios.de 'my_hdr From: Foo Bar
@@ -5307,19 +5307,18 @@
        When _u_n_s_e_t, the header fields normally added by the ``_m_y___h_d_r (section 3.15  ,
        page 34)'' command are not created.  This variable _m_u_s_t be _u_n_s_e_t before compos-
        ing a new message or replying in order to take effect.  If _s_e_t, the user
-
-       The Mutt Next Generation E-Mail Client                                      104
-
        defined header fields are added to every new message.
 
        _7_._4_._7_7  _h_e_a_d_e_r
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      104
+
        Default: no
 
        When _s_e_t, this variable causes Mutt-ng to include the header of the message you
-       are replying to into the edit buffer.  The ``_$_w_e_e_d (section 7.4.336  , page
+       are replying to into the edit buffer.  The ``_$_w_e_e_d (section 7.4.337  , page
        168)'' setting applies.
 
        _7_._4_._7_8  _h_e_a_d_e_r___c_a_c_h_e
@@ -5363,8 +5362,6 @@
        is primarily aimed at new users, neither of these should present a major prob-
        lem.
 
-       The Mutt Next Generation E-Mail Client                                      105
-
        _7_._4_._8_1  _h_i_d_d_e_n___h_o_s_t
 
        Type: boolean
@@ -5372,6 +5369,9 @@
        Default: no
 
        When _s_e_t, Mutt-ng will skip the host name part of ``_$_h_o_s_t_n_a_m_e (section
+
+       The Mutt Next Generation E-Mail Client                                      105
+
        7.4.89  , page 106)'' variable when adding the domain part to addresses.  This
        variable does not affect the generation of Message-ID: header fields, and it
        will not lead to the cut-off of first-level domains.
@@ -5419,8 +5419,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      106
-
        When _s_e_t, Mutt-ng will not show the presence of missing messages at the top of
        threads in the thread tree.  Note that when _$_h_i_d_e___l_i_m_i_t_e_d (section 7.4.82  ,
        page 105) is _s_e_t, this option will have no effect.
@@ -5429,6 +5427,8 @@
 
        Type: number
 
+       The Mutt Next Generation E-Mail Client                                      106
+
        Default: 10
 
        This variable controls the size (in number of strings remembered) of the string
@@ -5475,8 +5475,6 @@
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      107
-
        Availability: IMAP
 
        This is a colon-delimited list of authentication methods Mutt-ng may attempt to
@@ -5485,6 +5483,8 @@
        capability string, e.g. ``digest-md5'', ``gssapi'' or ``cram-md5''. This param-
        eter is case-insensitive.
 
+       The Mutt Next Generation E-Mail Client                                      107
+
        If this parameter is _u_n_s_e_t (the default) Mutt-ng will try all available meth-
        ods, in order from most-secure to least-secure.
 
@@ -5531,8 +5531,6 @@
 
        NNoottee:: This is a space separated list.
 
-       The Mutt Next Generation E-Mail Client                                      108
-
        _7_._4_._9_5  _i_m_a_p___h_o_m_e___n_a_m_e_s_p_a_c_e
 
        Type: string
@@ -5541,6 +5539,8 @@
 
        Availability: IMAP
 
+       The Mutt Next Generation E-Mail Client                                      108
+
        You normally want to see your personal folders alongside your INBOX in the IMAP
        browser. If you see something else, you may set this variable to the IMAP path
        to your folders.
@@ -5587,9 +5587,6 @@
        Your login name on the IMAP server.
 
        This variable defaults to the value of ``_$_i_m_a_p___u_s_e_r (section 7.4.105  , page
-
-       The Mutt Next Generation E-Mail Client                                      109
-
        110).''
 
        _7_._4_._9_9  _i_m_a_p___m_a_i_l___c_h_e_c_k
@@ -5598,6 +5595,8 @@
 
        Default: 300
 
+       The Mutt Next Generation E-Mail Client                                      109
+
        This variable configures how often (in seconds) Mutt-ng should look for new
        mail in IMAP folders. This is split from the ``_m_a_i_l___c_h_e_c_k (section 7.4.115  ,
        page 114)'' variable to generate less traffic and get more accurate information
@@ -5644,8 +5643,6 @@
        closing an IMAP folder somewhat slower. This option exists to appease speed
        freaks.
 
-       The Mutt Next Generation E-Mail Client                                      110
-
        _7_._4_._1_0_3  _i_m_a_p___r_e_c_o_n_n_e_c_t
 
        Type: quadoption
@@ -5654,6 +5651,8 @@
 
        Availability: IMAP
 
+       The Mutt Next Generation E-Mail Client                                      110
+
        Controls whether or not Mutt-ng will try to reconnect to IMAP server when the
        connection is lost.
 
@@ -5700,9 +5699,6 @@
        Default: ask-yes
 
        Controls whether or not a copy of the message(s) you are replying to is
-
-       The Mutt Next Generation E-Mail Client                                      111
-
        included in your reply.
 
        _7_._4_._1_0_8  _i_n_c_l_u_d_e___o_n_l_y_f_i_r_s_t
@@ -5711,6 +5707,8 @@
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      111
+
        Controls whether or not Mutt-ng includes only the first attachment of the mes-
        sage you are replying.
 
@@ -5756,8 +5754,6 @@
              %C
                    current message number
 
-       The Mutt Next Generation E-Mail Client                                      112
-
              %d
                    date and time of the message in the format specified by ``date_for-
                    mat'' converted to sender's time zone
@@ -5766,6 +5762,8 @@
                    date and time of the message in the format specified by ``date_for-
                    mat'' converted to the local time zone
 
+       The Mutt Next Generation E-Mail Client                                      112
+
              %e
                    current message number in thread
 
@@ -5812,8 +5810,6 @@
                    (_O_riginal save folder)  Where Mutt-ng would formerly have stashed
                    the message: list name or recipient name if no list
 
-       The Mutt Next Generation E-Mail Client                                      113
-
              %s
                    subject of the message
 
@@ -5823,8 +5819,10 @@
              %t
                    `to:' field (recipients)
 
+       The Mutt Next Generation E-Mail Client                                      113
+
              %T
-                   the appropriate character from the _$_t_o___c_h_a_r_s (section 7.4.323  ,
+                   the appropriate character from the _$_t_o___c_h_a_r_s (section 7.4.324  ,
                    page 165) string
 
              %u
@@ -5867,18 +5865,18 @@
                    the current local time. ``fmt'' is expanded by the library function
                    ``strftime''; a leading bang disables locales.
 
-       The Mutt Next Generation E-Mail Client                                      114
-
              %>X
                    right justify the rest of the string and pad with character 'X'
 
              %|X
                    pad to the end of the line with character 'X'
 
-       See also: ``_$_t_o___c_h_a_r_s (section 7.4.323  , page 165)''.
+       See also: ``_$_t_o___c_h_a_r_s (section 7.4.324  , page 165)''.
 
        _7_._4_._1_1_1  _i_s_p_e_l_l
 
+       The Mutt Next Generation E-Mail Client                                      114
+
        Type: path
 
        Default: 'ispell'
@@ -5923,8 +5921,6 @@
        This variable configures how often (in seconds) Mutt-ng should look for new
        mail.
 
-       The Mutt Next Generation E-Mail Client                                      115
-
        NNoottee:: This does not apply to IMAP mailboxes, see _$_i_m_a_p___m_a_i_l___c_h_e_c_k (section
        7.4.99  , page 108).
 
@@ -5935,6 +5931,9 @@
        Default: ''
 
        This variable specifies which files to consult when attempting to display MIME
+
+       The Mutt Next Generation E-Mail Client                                      115
+
        bodies not directly supported by Mutt-ng.
 
        _7_._4_._1_1_7  _m_a_i_l_c_a_p___s_a_n_i_t_i_z_e
@@ -5979,8 +5978,6 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      116
-
        Default: yes
 
        Controls whether or not Mutt-ng marks _n_e_w uunnrreeaadd messages as _o_l_d if you exit a
@@ -5990,6 +5987,8 @@
        up with an 'O' next to them in the ``index'' menu, indicating that they are
        old.
 
+       The Mutt Next Generation E-Mail Client                                      116
+
        _7_._4_._1_2_1  _m_a_r_k_e_r_s
 
        Type: boolean
@@ -5998,7 +5997,7 @@
 
        Controls the display of wrapped lines in the internal pager. If set, a ``+''
        marker is displayed at the beginning of wrapped lines. Also see the
-       ``_$_s_m_a_r_t___w_r_a_p (section 7.4.263  , page 149)'' variable.
+       ``_$_s_m_a_r_t___w_r_a_p (section 7.4.264  , page 149)'' variable.
 
        _7_._4_._1_2_2  _m_a_s_k
 
@@ -6030,23 +6029,23 @@
        When _s_e_t, the maximum line length for displaying ``format = flowed'' messages
        is limited to this length. A value of 0 (which is also the default) means that
        the maximum line length is determined by the terminal width and _$_w_r_a_p_m_a_r_g_i_n
-       (section 7.4.338  , page 168).
+       (section 7.4.339  , page 168).
 
        _7_._4_._1_2_5  _m_b_o_x
 
        Type: path
 
-       The Mutt Next Generation E-Mail Client                                      117
-
        Default: '~/mbox'
 
        This specifies the folder into which read mail in your ``_$_s_p_o_o_l_f_i_l_e (section
-       7.4.297  , page 157)'' folder will be appended.
+       7.4.298  , page 157)'' folder will be appended.
 
        _7_._4_._1_2_6  _m_b_o_x___t_y_p_e
 
        Type: folder magic
 
+       The Mutt Next Generation E-Mail Client                                      117
+
        Default: mbox
 
        The default mailbox type used when creating new folders. May be any of mbox,
@@ -6093,8 +6092,6 @@
        message/rfc822.  For a full listing of defined printf(3)-like sequences see the
        section on ``_$_i_n_d_e_x___f_o_r_m_a_t (section 7.4.110  , page 111)''.
 
-       The Mutt Next Generation E-Mail Client                                      118
-
        _7_._4_._1_3_1  _m_e_t_a___k_e_y
 
        Type: boolean
@@ -6103,6 +6100,9 @@
 
        If _s_e_t, forces Mutt-ng to interpret keystrokes with the high bit (bit 8) set as
        if the user had pressed the ESC key and whatever key remains after having the
+
+       The Mutt Next Generation E-Mail Client                                      118
+
        high bit removed.  For example, if the key pressed has an ASCII value of 0xf4,
        then this is treated as if the user had pressed ESC then ``x''.  This is
        because the result of removing the high bit from ``0xf4'' is ``0x74'', which is
@@ -6149,8 +6149,6 @@
 
        Default: 'unseen'
 
-       The Mutt Next Generation E-Mail Client                                      119
-
        The name of the MH sequence used for unseen messages.
 
        _7_._4_._1_3_7  _m_i_m_e___f_o_r_w_a_r_d
@@ -6159,6 +6157,8 @@
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      119
+
        When _s_e_t, the message you are forwarding will be attached as a separate MIME
        part instead of included in the main body of the message.
 
@@ -6206,14 +6206,14 @@
              %c
                    Remailer capabilities.
 
-       The Mutt Next Generation E-Mail Client                                      120
-
              %s
                    The remailer's short name.
 
              %a
                    The remailer's e-mail address.
 
+       The Mutt Next Generation E-Mail Client                                      120
+
        _7_._4_._1_4_1  _m_i_x_m_a_s_t_e_r
 
        Type: path
@@ -6262,8 +6262,6 @@
              %O
                    the current UNIX timestamp (octal)
 
-       The Mutt Next Generation E-Mail Client                                      121
-
              %p
                    the process ID
 
@@ -6271,6 +6269,8 @@
                    the current Message-ID prefix (a character rotating with every Mes-
                    sage-ID being generated)
 
+       The Mutt Next Generation E-Mail Client                                      121
+
              %r
                    a random integer value (decimal)
 
@@ -6319,8 +6319,6 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      122
-
        Default: no
 
        Availability: NNTP
@@ -6328,6 +6326,8 @@
        If _s_e_t, Mutt-ng will prompt you for the X-Comment-To: header field before edit-
        ing the body of an outgoing news article.
 
+       The Mutt Next Generation E-Mail Client                                      122
+
        _7_._4_._1_4_7  _n_n_t_p___c_a_c_h_e___d_i_r
 
        Type: path
@@ -6363,7 +6363,7 @@
        Availability: NNTP
 
        This variable controls how many news articles to cache per newsgroup (if
-       caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 7.4.147  , page 122)) and how
+       caching is enabled, see _$_n_n_t_p___c_a_c_h_e___d_i_r (section 7.4.147  , page 121)) and how
        many news articles to show in the ``index'' menu.
 
        If there're more articles than defined with _$_n_n_t_p___c_o_n_t_e_x_t (section 7.4.149  ,
@@ -6375,14 +6375,14 @@
 
        Default: ask-yes
 
-       The Mutt Next Generation E-Mail Client                                      123
-
        Availability: NNTP
 
        If this variable is _s_e_t and the keyword 'poster' is present in the Followup-To:
        header field, a follow-up to the newsgroup is not permitted.  The message will
        be mailed to the submitter of the message via mail.
 
+       The Mutt Next Generation E-Mail Client                                      123
+
        _7_._4_._1_5_1  _n_n_t_p___g_r_o_u_p___i_n_d_e_x___f_o_r_m_a_t
 
        Type: string
@@ -6429,14 +6429,14 @@
 
        _7_._4_._1_5_3  _n_n_t_p___i_n_e_w_s
 
-       The Mutt Next Generation E-Mail Client                                      124
-
        Type: path
 
        Default: ''
 
        Availability: NNTP
 
+       The Mutt Next Generation E-Mail Client                                      124
+
        If _s_e_t, specifies the program and arguments used to deliver news posted by
        Mutt-ng.  Otherwise, Mutt-ng posts article using current connection.  The fol-
        lowing printf(3)-style sequence is understood:
@@ -6483,14 +6483,14 @@
 
        _7_._4_._1_5_7  _n_n_t_p___n_e_w_s_r_c
 
-       The Mutt Next Generation E-Mail Client                                      125
-
        Type: path
 
        Default: '~/.newsrc'
 
        Availability: NNTP
 
+       The Mutt Next Generation E-Mail Client                                      125
+
        This file contains information about subscribed newsgroup and articles read so
        far.
 
@@ -6537,14 +6537,14 @@
        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                                      126
-
        _7_._4_._1_6_1  _n_n_t_p___s_a_v_e___u_n_s_u_b_s_c_r_i_b_e_d
 
        Type: boolean
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      126
+
        Availability: NNTP
 
        When _s_e_t, info about unsubscribed newsgroups will be saved into the ``newsrc''
@@ -6593,8 +6593,6 @@
 
        Availability: NNTP
 
-       The Mutt Next Generation E-Mail Client                                      127
-
        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.
 
@@ -6602,6 +6600,8 @@
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      127
+
        Default: ''
 
        This specifies the operating system name for the User-Agent: header field. If
@@ -6649,8 +6649,6 @@
 
        _7_._4_._1_7_0  _p_a_g_e_r___i_n_d_e_x___l_i_n_e_s
 
-       The Mutt Next Generation E-Mail Client                                      128
-
        Type: number
 
        Default: 0
@@ -6658,6 +6656,9 @@
        Determines the number of lines of a mini-index which is shown when in the
        pager.  The current message, unless near the top or bottom of the folder, will
        be roughly one third of the way down this mini-index, giving the reader the
+
+       The Mutt Next Generation E-Mail Client                                      128
+
        context of a few messages before and after the message.  This is useful, for
        example, to determine how many messages remain to be read in the current
        thread.  One of the lines is reserved for the status bar from the index, so a
@@ -6706,14 +6707,14 @@
        Also note that using the old-style PGP message format is ssttrroonnggllyy ddeepprreeccaatteedd.
        (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      129
-
        _7_._4_._1_7_4  _p_g_p___c_h_e_c_k___e_x_i_t
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      129
+
        If _s_e_t, Mutt-ng will check the exit code of the PGP subprocess when signing or
        encrypting.  A non-zero exit code means that the subprocess failed.  (PGP only)
 
@@ -6762,14 +6763,14 @@
 
        _7_._4_._1_7_7  _p_g_p___d_e_c_r_y_p_t___c_o_m_m_a_n_d
 
-       The Mutt Next Generation E-Mail Client                                      130
-
        Type: string
 
        Default: ''
 
        This command is used to decrypt a PGP encrypted message.  (PGP only)
 
+       The Mutt Next Generation E-Mail Client                                      130
+
        _7_._4_._1_7_8  _p_g_p___e_n_c_r_y_p_t___o_n_l_y___c_o_m_m_a_n_d
 
        Type: string
@@ -6817,8 +6818,6 @@
              %c
                    capabilities
 
-       The Mutt Next Generation E-Mail Client                                      131
-
              %t
                    trust/validity of the key-uid association
 
@@ -6827,6 +6826,8 @@
 
        (PGP only)
 
+       The Mutt Next Generation E-Mail Client                                      131
+
        _7_._4_._1_8_1  _p_g_p___e_x_p_o_r_t___c_o_m_m_a_n_d
 
        Type: string
@@ -6873,9 +6874,6 @@
        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                                      132
-
        ring.  (PGP only)
 
        _7_._4_._1_8_6  _p_g_p___l_i_s_t___p_u_b_r_i_n_g___c_o_m_m_a_n_d
@@ -6884,6 +6882,8 @@
 
        Default: ''
 
+       The Mutt Next Generation E-Mail Client                                      132
+
        This command is used to list the public key ring's contents.  The output format
        must be analogous to the one used by gpg --list-keys --with-colons.
 
@@ -6930,8 +6930,6 @@
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      133
-
        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
@@ -6940,6 +6938,9 @@
        checked/flagged messages.
 
        Note that Mutt-ng might automatically use PGP/MIME for messages which consist
+
+       The Mutt Next Generation E-Mail Client                                      133
+
        of more than a single MIME part.  Mutt-ng can be configured to ask before send-
        ing PGP/MIME messages when inline (traditional) would not work.  See also:
        ``_$_p_g_p___m_i_m_e___a_u_t_o (section 7.4.189  , page 132)''.
@@ -6986,8 +6987,6 @@
 
        Default: ''
 
-       The Mutt Next Generation E-Mail Client                                      134
-
        This command is used to create the detached PGP signature for a multi-
        part/signed PGP/MIME body part.  (PGP only)
 
@@ -6997,6 +6996,8 @@
 
        Default: address
 
+       The Mutt Next Generation E-Mail Client                                      134
+
        Specifies how the entries in the ``pgp keys'' menu are sorted. The following
        are legal values:
 
@@ -7043,8 +7044,6 @@
 
        If _s_e_t, Mutt-ng will use a possibly-running gpg-agent process.  (PGP only)
 
-       The Mutt Next Generation E-Mail Client                                      135
-
        _7_._4_._1_9_9  _p_g_p___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
@@ -7053,6 +7052,8 @@
 
        This command is used to verify PGP signatures.  (PGP only)
 
+       The Mutt Next Generation E-Mail Client                                      135
+
        _7_._4_._2_0_0  _p_g_p___v_e_r_i_f_y___k_e_y___c_o_m_m_a_n_d
 
        Type: string
@@ -7100,8 +7101,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      136
-
        Availability: POP
 
        If _s_e_t, Mutt-ng will try all available methods. When _u_n_s_e_t, Mutt-ng will only
@@ -7109,6 +7108,8 @@
        able. If a method is available but authentication fails, Mutt-ng will not con-
        nect to the POP server.
 
+       The Mutt Next Generation E-Mail Client                                      136
+
        _7_._4_._2_0_5  _p_o_p___a_u_t_h_e_n_t_i_c_a_t_o_r_s
 
        Type: string
@@ -7156,8 +7157,6 @@
        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                                      137
-
        _7_._4_._2_0_8  _p_o_p___l_a_s_t
 
        Type: boolean
@@ -7166,6 +7165,8 @@
 
        Availability: POP
 
+       The Mutt Next Generation E-Mail Client                                      137
+
        If this variable is _s_e_t, Mutt-ng will try to use the ``LAST'' POP command for
        retrieving only unread messages from the POP server when using the ``fetch-
        mail'' function.
@@ -7213,8 +7214,6 @@
 
        Availability: POP
 
-       The Mutt Next Generation E-Mail Client                                      138
-
        Your login name on the POP server.
 
        This variable defaults to your user name on the local machine.
@@ -7223,6 +7222,8 @@
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      138
+
        Default: ''
 
        Similar to the ``_$_a_t_t_r_i_b_u_t_i_o_n (section 7.4.15  , page 89)'' variable, Mutt-ng
@@ -7244,10 +7245,10 @@
 
        Default: '~/postponed'
 
-       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 7.4.214  , page 138)
+       Mutt-ng allows you to indefinitely ``_p_o_s_t_p_o_n_e (section 7.4.214  , page 137)
        sending a message'' which you are editing.  When you choose to postpone a mes-
        sage, Mutt-ng saves it in the mailbox specified by this variable.  Also see the
-       ``_$_p_o_s_t_p_o_n_e (section 7.4.214  , page 138)'' variable.
+       ``_$_p_o_s_t_p_o_n_e (section 7.4.214  , page 137)'' variable.
 
        _7_._4_._2_1_6  _p_r_e_c_o_n_n_e_c_t
 
@@ -7268,8 +7269,6 @@
        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                                      139
-
        _7_._4_._2_1_7  _p_r_i_n_t
 
        Type: quadoption
@@ -7279,6 +7278,8 @@
        Controls whether or not Mutt-ng really prints messages.  This is set to _a_s_k_-_n_o
        by default, because some people accidentally hit ``p'' often.
 
+       The Mutt Next Generation E-Mail Client                                      139
+
        _7_._4_._2_1_8  _p_r_i_n_t___c_o_m_m_a_n_d
 
        Type: path
@@ -7295,7 +7296,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 7.4.218  , page 139).  If this option is _u_n_s_e_t, no pro-
+       _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.218  , page 138).  If this option is _u_n_s_e_t, no pro-
        cessing will be applied to the message when printing it.  The latter setting
        may be useful if you are using some advanced printer filter which is able to
        properly format e-mail messages for printing.
@@ -7307,9 +7308,9 @@
        Default: no
 
        Used in connection with the print-message command.  If this option is _s_e_t, the
-       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.218  , page 139) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.218  , page 138) is executed
        once for each message which is to be printed.  If this option is _u_n_s_e_t, the
-       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.218  , page 139) is executed
+       command specified by _$_p_r_i_n_t___c_o_m_m_a_n_d (section 7.4.218  , page 138) is executed
        only once, and all the messages are concatenated, with a form feed as the mes-
        sage separator.
 
@@ -7324,9 +7325,6 @@
 
        If you use an _e_x_t_e_r_n_a_l ``_$_p_a_g_e_r (section 7.4.167  , page 127)'', setting this
        variable will cause Mutt-ng to prompt you for a command when the pager exits
-
-       The Mutt Next Generation E-Mail Client                                      140
-
        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.
 
@@ -7336,6 +7334,8 @@
 
        Default: ''
 
+       The Mutt Next Generation E-Mail Client                                      140
+
        This specifies the command that Mutt-ng will use to make external address
        queries.  The string should contain a %s, which will be substituted with the
        query string the user types.  See ``_q_u_e_r_y (section 4.7  , page 55)'' for more
@@ -7381,9 +7381,6 @@
        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                                      141
-
        set this to a regular expression that matches _e_x_a_c_t_l_y the quote characters at
        the beginning of quoted lines.
 
@@ -7393,6 +7390,8 @@
 
        Default: 10
 
+       The Mutt Next Generation E-Mail Client                                      141
+
        If set to a value greater than 0, Mutt-ng will display which message it is cur-
        rently on when reading a mailbox.  The message is printed after _r_e_a_d___i_n_c mes-
        sages have been read (e.g., if set to 25, Mutt-ng will print a message when it
@@ -7401,7 +7400,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 7.4.340  , page 168)'' variable.
+       Also see the ``_$_w_r_i_t_e___i_n_c (section 7.4.341  , page 168)'' variable.
 
        _7_._4_._2_2_8  _r_e_a_d___o_n_l_y
 
@@ -7438,8 +7437,6 @@
 
        _7_._4_._2_3_1  _r_e_c_o_r_d
 
-       The Mutt Next Generation E-Mail Client                                      142
-
        Type: path
 
        Default: ''
@@ -7449,8 +7446,10 @@
        another way to do this is using the ``_m_y___h_d_r (section 3.15  , page 34)'' com-
        mand to create a Bcc: header field with your email address in it.)
 
+       The Mutt Next Generation E-Mail Client                                      142
+
        The value of _$_r_e_c_o_r_d _(_s_e_c_t_i_o_n _7_._4_._2_3_1  _, _p_a_g_e _1_4_1_) is overridden by the
-       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 102)'' and ``_$_s_a_v_e___n_a_m_e (section
+       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 101)'' and ``_$_s_a_v_e___n_a_m_e (section
        7.4.242  , page 144)'' variables, and the ``_f_c_c_-_h_o_o_k (section 3.18  , page
        35)'' command.
 
@@ -7494,8 +7493,6 @@
 
        Default: yes
 
-       The Mutt Next Generation E-Mail Client                                      143
-
        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.
@@ -7506,6 +7503,8 @@
 
        Default: no
 
+       The Mutt Next Generation E-Mail Client                                      143
+
        This variable controls whether or not Mutt-ng will display the ``personal''
        name from your aliases in the index menu if it finds an alias that matches the
        message's sender.  For example, if you have the following alias:
@@ -7550,8 +7549,6 @@
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      144
-
        Default: no
 
        When this variable is _s_e_t, Mutt-ng will decode RFC-2047-encoded MIME parame-
@@ -7563,6 +7560,8 @@
        When this variable is _s_e_t interactively, the change doesn't have the desired
        effect before you have changed folders.
 
+       The Mutt Next Generation E-Mail Client                                      144
+
        Note that this use of RFC 2047's encoding is explicitly, prohibited by the
        standard, but nevertheless encountered in the wild.
 
@@ -7578,7 +7577,7 @@
 
        If _s_e_t, Mutt-ng will take the sender's full address when choosing a default
        folder for saving a mail. If ``_$_s_a_v_e___n_a_m_e (section 7.4.242  , page 144)'' or
-       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 102)'' is _s_e_t too, the selection of the
+       ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 101)'' is _s_e_t too, the selection of the
        fcc folder will be changed as well.
 
        _7_._4_._2_4_1  _s_a_v_e___e_m_p_t_y
@@ -7588,7 +7587,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 7.4.297  , page 157)'' which is
+       closed (the exception is ``_$_s_p_o_o_l_f_i_l_e (section 7.4.298  , page 157)'' which is
        never removed).  If _s_e_t, mailboxes are never removed.
 
        NNoottee:: This only applies to mbox and MMDF folders, Mutt-ng does not delete MH
@@ -7607,9 +7606,7 @@
        mailbox exists, the outgoing message will be saved to that mailbox, otherwise
        the message is saved to the ``_$_r_e_c_o_r_d (section 7.4.231  , page 141)'' mailbox.
 
-       The Mutt Next Generation E-Mail Client                                      145
-
-       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 102)'' variable.
+       Also see the ``_$_f_o_r_c_e___n_a_m_e (section 7.4.68  , page 101)'' variable.
 
        _7_._4_._2_4_3  _s_c_o_r_e
 
@@ -7618,8 +7615,12 @@
        Default: yes
 
        When this variable is _u_n_s_e_t, scoring is turned off.  This can be useful to
-       selectively disable scoring for certain folders when the ``_$_s_c_o_r_e___t_h_r_e_s_h_-
-       _o_l_d___d_e_l_e_t_e (section 7.4.244  , page 145)'' variable and friends are used.
+       selectively disable scoring for certain folders when the
+
+       The Mutt Next Generation E-Mail Client                                      145
+
+       ``_$_s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e (section 7.4.244  , page 144)'' variable and friends
+       are used.
 
        _7_._4_._2_4_4  _s_c_o_r_e___t_h_r_e_s_h_o_l_d___d_e_l_e_t_e
 
@@ -7663,9 +7664,6 @@
        (section 7.4.24  , page 91)'' is not iso-8859-1 and recipients may not under-
        stand UTF-8, it is advisable to include in the list an appropriate widely used
        standard character set (such as iso-8859-2, koi8-r or iso-2022-jp) either
-
-       The Mutt Next Generation E-Mail Client                                      146
-
        instead of or after iso-8859-1.
 
        _7_._4_._2_4_8  _s_e_n_d_m_a_i_l
@@ -7675,6 +7673,9 @@
        Default: '/usr/sbin/sendmail -oem -oi'
 
        Specifies the program and arguments used to deliver mail sent by Mutt-ng.
+
+       The Mutt Next Generation E-Mail Client                                      146
+
        Mutt-ng expects that the specified program interprets additional arguments as
        recipient addresses.
 
@@ -7720,9 +7721,6 @@
 
        When the sidebar is displayed and _$_s_i_d_e_b_a_r___s_h_o_r_t_e_n___h_i_e_r_a_r_c_h_y (section
        7.4.255  , page 147) is _s_e_t, this variable specifies the characters at which to
-
-       The Mutt Next Generation E-Mail Client                                      147
-
        split a folder name into ``hierarchy items.''
 
        _7_._4_._2_5_2  _s_i_d_e_b_a_r___d_e_l_i_m
@@ -7732,6 +7730,9 @@
        Default: '|'
 
        This specifies the delimiter between the sidebar (if visible) and other
+
+       The Mutt Next Generation E-Mail Client                                      147
+
        screens.
 
        _7_._4_._2_5_3  _s_i_d_e_b_a_r___n_e_w_m_a_i_l___o_n_l_y
@@ -7777,8 +7778,6 @@
        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                                      148
-
        _7_._4_._2_5_5  _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
@@ -7787,10 +7786,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
-       7.4.257  , page 148)'' is set to a too low value). For example, if the news-
-       group name ``de.alt.sysadmin.recovery'' doesn't fit on the screen, it'll get
-       shortened ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will not
-       get shortened.
+       7.4.257  , page 148)'' is set to a too low value). For example, if the
+
+       The Mutt Next Generation E-Mail Client                                      148
+
+       newsgroup name ``de.alt.sysadmin.recovery'' doesn't fit on the screen, it'll
+       get shortened ``d.a.s.recovery'' while ``de.alt.d0'' still would and thus will
+       not get shortened.
 
        At which characters this compression is done is controled via the _$_s_i_d_e_-
        _b_a_r___b_o_u_n_d_a_r_y (section 7.4.251  , page 146) variable.
@@ -7833,8 +7835,6 @@
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      149
-
        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
@@ -7844,13 +7844,28 @@
 
        Type: path
 
+       The Mutt Next Generation E-Mail Client                                      149
+
        Default: '~/.signature'
 
        Specifies the filename of your signature, which is appended to all outgoing
        messages.   If the filename ends with a pipe (``|''), it is assumed that file-
        name is a shell command and input should be read from its stdout.
 
-       _7_._4_._2_6_1  _s_i_m_p_l_e___s_e_a_r_c_h
+       _7_._4_._2_6_1  _s_i_g_n_o_f_f___s_t_r_i_n_g
+
+       Type: string
+
+       Default: ''
+
+       If _s_e_t, this string will be inserted before the signature. This is useful for
+       people that want to sign off every message they send with their name.
+
+       If you want to insert your website's URL, additional contact information or
+       witty quotes into your mails, better use a signature file instead of the sig-
+       noff string.
+
+       _7_._4_._2_6_2  _s_i_m_p_l_e___s_e_a_r_c_h
 
        Type: string
 
@@ -7866,7 +7881,7 @@
 
        ~f joe | ~s joe
 
-       _7_._4_._2_6_2  _s_l_e_e_p___t_i_m_e
+       _7_._4_._2_6_3  _s_l_e_e_p___t_i_m_e
 
        Type: number
 
@@ -7877,7 +7892,7 @@
        the current folder.  The default is to pause one second, so a value of zero for
        this option suppresses the pause.
 
-       _7_._4_._2_6_3  _s_m_a_r_t___w_r_a_p
+       _7_._4_._2_6_4  _s_m_a_r_t___w_r_a_p
 
        Type: boolean
 
@@ -7885,12 +7900,13 @@
 
        Controls the display of lines longer than the screen width in the internal
        pager. If _s_e_t, long lines are wrapped at a word boundary.  If _u_n_s_e_t, lines are
-       simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 7.4.121  ,
-       page 116)'' variable.
 
        The Mutt Next Generation E-Mail Client                                      150
 
-       _7_._4_._2_6_4  _s_m_i_l_e_y_s
+       simply wrapped at the screen edge. Also see the ``_$_m_a_r_k_e_r_s (section 7.4.121  ,
+       page 115)'' variable.
+
+       _7_._4_._2_6_5  _s_m_i_l_e_y_s
 
        Type: regular expression
 
@@ -7900,7 +7916,7 @@
        ``_$_q_u_o_t_e___r_e_g_e_x_p (section 7.4.226  , page 140)'', most notably smileys in the
        beginning of a line
 
-       _7_._4_._2_6_5  _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l
+       _7_._4_._2_6_6  _s_m_i_m_e___a_s_k___c_e_r_t___l_a_b_e_l
 
        Type: boolean
 
@@ -7910,7 +7926,7 @@
        cate about to be added to the database or not. It is _s_e_t by default.  (S/MIME
        only)
 
-       _7_._4_._2_6_6  _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n
+       _7_._4_._2_6_7  _s_m_i_m_e___c_a___l_o_c_a_t_i_o_n
 
        Type: path
 
@@ -7919,7 +7935,7 @@
        This variable contains the name of either a directory, or a file which contains
        trusted certificates for use with OpenSSL.  (S/MIME only)
 
-       _7_._4_._2_6_7  _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s
+       _7_._4_._2_6_8  _s_m_i_m_e___c_e_r_t_i_f_i_c_a_t_e_s
 
        Type: path
 
@@ -7932,7 +7948,7 @@
        address keyid pairs, and which can be manually edited. This one points to the
        location of the certificates.  (S/MIME only)
 
-       _7_._4_._2_6_8  _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._2_6_9  _s_m_i_m_e___d_e_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -7941,11 +7957,11 @@
        This format string specifies a command which is used to decrypt application/x-
        pkcs7-mime attachments.
 
+       The Mutt Next Generation E-Mail Client                                      151
+
        The OpenSSL command formats have their own set of printf(3)-like sequences sim-
        ilar to PGP's:
 
-       The Mutt Next Generation E-Mail Client                                      151
-
              %f
                    Expands to the name of a file containing a message.
 
@@ -7954,7 +7970,7 @@
                    multipart/signed attachment when verifying it.
 
              %k
-                   The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 7.4.270  ,
+                   The key-pair specified with _$_s_m_i_m_e___d_e_f_a_u_l_t___k_e_y (section 7.4.271  ,
                    page 151)
 
              %c
@@ -7965,15 +7981,15 @@
 
              %C
                    CA location:  Depending on whether _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section
-                   7.4.266  , page 150) points to a directory or file, this expands to
-                   '-CApath _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.266  , page 150)' or
-                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.266  , page 150)'.
+                   7.4.267  , page 150) points to a directory or file, this expands to
+                   '-CApath _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.267  , page 150)' or
+                   '-CAfile _$_s_m_i_m_e___c_a___l_o_c_a_t_i_o_n (section 7.4.267  , page 150)'.
 
        For examples on how to configure these formats, see the smime.rc in the sam-
        ples/ subdirectory which has been installed on your system alongside the docu-
        mentation.  (S/MIME only)
 
-       _7_._4_._2_6_9  _s_m_i_m_e___d_e_c_r_y_p_t___u_s_e___d_e_f_a_u_l_t___k_e_y
+       _7_._4_._2_7_0  _s_m_i_m_e___d_e_c_r_y_p_t___u_s_e___d_e_f_a_u_l_t___k_e_y
 
        Type: boolean
 
@@ -7984,7 +8000,7 @@
        mailbox-address to determine the key to use. It will ask you to supply a key,
        if it can't find one.  (S/MIME only)
 
-       _7_._4_._2_7_0  _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y
+       _7_._4_._2_7_1  _s_m_i_m_e___d_e_f_a_u_l_t___k_e_y
 
        Type: string
 
@@ -7993,17 +8009,17 @@
        This is the default key-pair to use for signing. This must be set to the keyid
        (the hash-value that OpenSSL generates) to work properly (S/MIME only)
 
-       _7_._4_._2_7_1  _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_2  _s_m_i_m_e___e_n_c_r_y_p_t___c_o_m_m_a_n_d
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      152
+
        Default: ''
 
        This command is used to create encrypted S/MIME messages.  (S/MIME only)
 
-       The Mutt Next Generation E-Mail Client                                      152
-
-       _7_._4_._2_7_2  _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h
+       _7_._4_._2_7_3  _s_m_i_m_e___e_n_c_r_y_p_t___w_i_t_h
 
        Type: string
 
@@ -8014,7 +8030,7 @@
 
        If _u_n_s_e_t ``_3_d_e_s'' (TripleDES) is used.  (S/MIME only)
 
-       _7_._4_._2_7_3  _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_4  _s_m_i_m_e___g_e_t___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8023,7 +8039,7 @@
        This command is used to extract X509 certificates from a PKCS7 structure.
        (S/MIME only)
 
-       _7_._4_._2_7_4  _s_m_i_m_e___g_e_t___c_e_r_t___e_m_a_i_l___c_o_m_m_a_n_d
+       _7_._4_._2_7_5  _s_m_i_m_e___g_e_t___c_e_r_t___e_m_a_i_l___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8033,7 +8049,7 @@
        tificates, and for verification purposes (to check whether the certificate was
        issued for the sender's mailbox).  (S/MIME only)
 
-       _7_._4_._2_7_5  _s_m_i_m_e___g_e_t___s_i_g_n_e_r___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_6  _s_m_i_m_e___g_e_t___s_i_g_n_e_r___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8043,7 +8059,7 @@
        signature, so that the certificate's owner may get compared to the email's
        ``From:'' header field.  (S/MIME only)
 
-       _7_._4_._2_7_6  _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d
+       _7_._4_._2_7_7  _s_m_i_m_e___i_m_p_o_r_t___c_e_r_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8051,14 +8067,14 @@
 
        This command is used to import a certificate via smime_keysng.  (S/MIME only)
 
-       _7_._4_._2_7_7  _s_m_i_m_e___i_s___d_e_f_a_u_l_t
+       _7_._4_._2_7_8  _s_m_i_m_e___i_s___d_e_f_a_u_l_t
+
+       The Mutt Next Generation E-Mail Client                                      153
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      153
-
        The default behaviour of Mutt-ng is to use PGP on all auto-sign/encryption
        operations. To override and to use OpenSSL instead this must be _s_e_t.
 
@@ -8068,7 +8084,7 @@
        (Note that this variable can be overridden by unsetting _$_c_r_y_p_t___a_u_t_o_s_m_i_m_e (sec-
        tion 7.4.37  , page 94).)  (S/MIME only)
 
-       _7_._4_._2_7_8  _s_m_i_m_e___k_e_y_s
+       _7_._4_._2_7_9  _s_m_i_m_e___k_e_y_s
 
        Type: path
 
@@ -8081,7 +8097,7 @@
        address keyid pair, and which can be manually edited. This one points to the
        location of the private keys.  (S/MIME only)
 
-       _7_._4_._2_7_9  _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d
+       _7_._4_._2_8_0  _s_m_i_m_e___p_k_7_o_u_t___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8090,7 +8106,7 @@
        This command is used to extract PKCS7 structures of S/MIME signatures, in order
        to extract the public X509 certificate(s).  (S/MIME only)
 
-       _7_._4_._2_8_0  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
+       _7_._4_._2_8_1  _s_m_i_m_e___s_i_g_n___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8099,7 +8115,7 @@
        This command is used to created S/MIME signatures of type multipart/signed,
        which can be read by all mail clients.  (S/MIME only)
 
-       _7_._4_._2_8_1  _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d
+       _7_._4_._2_8_2  _s_m_i_m_e___s_i_g_n___o_p_a_q_u_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8109,18 +8125,18 @@
        pkcs7-signature, which can only be handled by mail clients supporting the
        S/MIME extension.  (S/MIME only)
 
-       _7_._4_._2_8_2  _s_m_i_m_e___t_i_m_e_o_u_t
+       The Mutt Next Generation E-Mail Client                                      154
 
-       Type: number
+       _7_._4_._2_8_3  _s_m_i_m_e___t_i_m_e_o_u_t
 
-       The Mutt Next Generation E-Mail Client                                      154
+       Type: number
 
        Default: 300
 
        The number of seconds after which a cached passphrase will expire if not used.
        (S/MIME only)
 
-       _7_._4_._2_8_3  _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d
+       _7_._4_._2_8_4  _s_m_i_m_e___v_e_r_i_f_y___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8129,7 +8145,7 @@
        This command is used to verify S/MIME signatures of type multipart/signed.
        (S/MIME only)
 
-       _7_._4_._2_8_4  _s_m_i_m_e___v_e_r_i_f_y___o_p_a_q_u_e___c_o_m_m_a_n_d
+       _7_._4_._2_8_5  _s_m_i_m_e___v_e_r_i_f_y___o_p_a_q_u_e___c_o_m_m_a_n_d
 
        Type: string
 
@@ -8138,7 +8154,7 @@
        This command is used to verify S/MIME signatures of type application/x-
        pkcs7-mime.  (S/MIME only)
 
-       _7_._4_._2_8_5  _s_m_t_p___e_n_v_e_l_o_p_e
+       _7_._4_._2_8_6  _s_m_t_p___e_n_v_e_l_o_p_e
 
        Type: string
 
@@ -8153,7 +8169,7 @@
        envelope sender but only a particular one which may not be the same as the
        user's desired From: header.
 
-       _7_._4_._2_8_6  _s_m_t_p___h_o_s_t
+       _7_._4_._2_8_7  _s_m_t_p___h_o_s_t
 
        Type: string
 
@@ -8165,24 +8181,24 @@
        ing the sendmail binary.  Setting this variable overrides the value of ``_$_s_e_n_d_-
        _m_a_i_l (section 7.4.248  , page 145)'', and any associated variables.
 
-       _7_._4_._2_8_7  _s_m_t_p___p_a_s_s
+       The Mutt Next Generation E-Mail Client                                      155
 
-       Type: string
+       _7_._4_._2_8_8  _s_m_t_p___p_a_s_s
 
-       The Mutt Next Generation E-Mail Client                                      155
+       Type: string
 
        Default: ''
 
        Availability: SMTP
 
        Defines the password to use with SMTP AUTH.  If ``_$_s_m_t_p___u_s_e_r (section
-       7.4.290  , page 155)'' is set, but this variable is not, you will be prompted
+       7.4.291  , page 155)'' is set, but this variable is not, you will be prompted
        for a password when sending.
 
        NNoottee:: Storing passwords in a configuration file presents a security risk since
        the superuser of your machine may read it regardless of the file's permissions.
 
-       _7_._4_._2_8_8  _s_m_t_p___p_o_r_t
+       _7_._4_._2_8_9  _s_m_t_p___p_o_r_t
 
        Type: number
 
@@ -8196,7 +8212,7 @@
        Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP servers
        will probably desire 587, the mail submission port.
 
-       _7_._4_._2_8_9  _s_m_t_p___u_s_e___t_l_s
+       _7_._4_._2_9_0  _s_m_t_p___u_s_e___t_l_s
 
        Type: string
 
@@ -8210,7 +8226,7 @@
        continue without TLS in case of an error.  Muttng still needs to have SSL sup-
        port enabled in order to use it.
 
-       _7_._4_._2_9_0  _s_m_t_p___u_s_e_r
+       _7_._4_._2_9_1  _s_m_t_p___u_s_e_r
 
        Type: string
 
@@ -8221,11 +8237,11 @@
        Defines the username to use with SMTP AUTH.  Setting this variable will cause
        Mutt-ng to attempt to use SMTP AUTH when sending.
 
-       _7_._4_._2_9_1  _s_o_r_t
+       The Mutt Next Generation E-Mail Client                                      156
 
-       Type: sort order
+       _7_._4_._2_9_2  _s_o_r_t
 
-       The Mutt Next Generation E-Mail Client                                      156
+       Type: sort order
 
        Default: date
 
@@ -8245,7 +8261,7 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort=reverse-date-sent).
 
-       _7_._4_._2_9_2  _s_o_r_t___a_l_i_a_s
+       _7_._4_._2_9_3  _s_o_r_t___a_l_i_a_s
 
        Type: sort order
 
@@ -8258,7 +8274,7 @@
                alias (sort alphabetically by alias name)
                unsorted (leave in order specified in .muttrc)
 
-       _7_._4_._2_9_3  _s_o_r_t___a_u_x
+       _7_._4_._2_9_4  _s_o_r_t___a_u_x
 
        Type: sort order
 
@@ -8266,24 +8282,24 @@
 
        When sorting by threads, this variable controls how threads are sorted in rela-
        tion to other threads, and how the branches of the thread trees are sorted.
-       This can be set to any value that ``_$_s_o_r_t (section 7.4.291  , page 155)'' can,
+       This can be set to any value that ``_$_s_o_r_t (section 7.4.292  , page 155)'' can,
        except threads (in that case, Mutt-ng will just use date-sent).  You can also
        specify the ``last-'' prefix in addition to ``reverse-'' prefix, but last- must
        come after reverse-.  The last- prefix causes messages to be sorted against its
        siblings by which has the last descendant, using the rest of sort_aux as an
        ordering.
 
+       The Mutt Next Generation E-Mail Client                                      157
+
        For instance, set sort_aux=last-date-received would mean that if a new message
        is received in a thread, that thread becomes the last one displayed (or the
        first, if you have set sort=reverse-threads.)
 
-       The Mutt Next Generation E-Mail Client                                      157
-
-       NNoottee:: For reversed ``_$_s_o_r_t (section 7.4.291  , page 155)'' order _$_s_o_r_t___a_u_x
-       (section 7.4.293  , page 156) is reversed again (which is not the right thing
+       NNoottee:: For reversed ``_$_s_o_r_t (section 7.4.292  , page 155)'' order _$_s_o_r_t___a_u_x
+       (section 7.4.294  , page 156) is reversed again (which is not the right thing
        to do, but kept to not break any existing configuration setting).
 
-       _7_._4_._2_9_4  _s_o_r_t___b_r_o_w_s_e_r
+       _7_._4_._2_9_5  _s_o_r_t___b_r_o_w_s_e_r
 
        Type: sort order
 
@@ -8300,40 +8316,40 @@
        You may optionally use the ``reverse-'' prefix to specify reverse sorting order
        (example: set sort_browser=reverse-date).
 
-       _7_._4_._2_9_5  _s_o_r_t___r_e
+       _7_._4_._2_9_6  _s_o_r_t___r_e
 
        Type: boolean
 
        Default: yes
 
        This variable is only useful when sorting by threads with ``_$_s_t_r_i_c_t___t_h_r_e_a_d_s
-       (section 7.4.312  , page 163)'' _u_n_s_e_t. In that case, it changes the heuristic
-       Mutt-ng uses to thread messages by subject.  With _$_s_o_r_t___r_e (section 7.4.295  ,
+       (section 7.4.313  , page 163)'' _u_n_s_e_t. In that case, it changes the heuristic
+       Mutt-ng uses to thread messages by subject.  With _$_s_o_r_t___r_e (section 7.4.296  ,
        page 157) _s_e_t, Mutt-ng will only attach a message as the child of another mes-
        sage by subject if the subject of the child message starts with a substring
-       matching the setting of ``_$_r_e_p_l_y___r_e_g_e_x_p (section 7.4.232  , page 142)''. With
-       _$_s_o_r_t___r_e (section 7.4.295  , page 157) _u_n_s_e_t, Mutt-ng will attach the message
+       matching the setting of ``_$_r_e_p_l_y___r_e_g_e_x_p (section 7.4.232  , page 141)''. With
+       _$_s_o_r_t___r_e (section 7.4.296  , page 157) _u_n_s_e_t, Mutt-ng will attach the message
        whether or not this is the case, as long as the non-``_$_r_e_p_l_y___r_e_g_e_x_p (section
-       7.4.232  , page 142)'' parts of both messages are identical.
+       7.4.232  , page 141)'' parts of both messages are identical.
 
-       _7_._4_._2_9_6  _s_p_a_m___s_e_p_a_r_a_t_o_r
+       _7_._4_._2_9_7  _s_p_a_m___s_e_p_a_r_a_t_o_r
 
        Type: string
 
        Default: ','
 
-       ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.296  , page 157)'' controls what happens when
+       ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.297  , page 157)'' controls what happens when
        multiple spam headers are matched: if _u_n_s_e_t, each successive header will over-
        write any previous matches value for the spam label. If _s_e_t, each successive
-       match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.296  ,
+       match will append to the previous, using ``_s_p_a_m___s_e_p_a_r_a_t_o_r (section 7.4.297  ,
        page 157)'' as a separator.
 
-       _7_._4_._2_9_7  _s_p_o_o_l_f_i_l_e
+       The Mutt Next Generation E-Mail Client                                      158
+
+       _7_._4_._2_9_8  _s_p_o_o_l_f_i_l_e
 
        Type: path
 
-       The Mutt Next Generation E-Mail Client                                      158
-
        Default: ''
 
        If your spool mailbox is in a non-default place where Mutt-ng cannot find it,
@@ -8341,7 +8357,7 @@
        set this variable to the value of the environment variable $MAIL if it is not
        set.
 
-       _7_._4_._2_9_8  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
+       _7_._4_._2_9_9  _s_s_l___c_a___c_e_r_t_i_f_i_c_a_t_e_s___f_i_l_e
 
        Type: path
 
@@ -8353,7 +8369,7 @@
 
        Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 
-       _7_._4_._2_9_9  _s_s_l___c_l_i_e_n_t___c_e_r_t
+       _7_._4_._3_0_0  _s_s_l___c_l_i_e_n_t___c_e_r_t
 
        Type: path
 
@@ -8363,7 +8379,7 @@
 
        The file containing a client certificate and its associated private key.
 
-       _7_._4_._3_0_0  _s_s_l___f_o_r_c_e___t_l_s
+       _7_._4_._3_0_1  _s_s_l___f_o_r_c_e___t_l_s
 
        Type: boolean
 
@@ -8373,9 +8389,9 @@
        servers be encrypted. Furthermore it will attempt to negotiate TLS even if the
        server does not advertise the capability, since it would otherwise have to
        abort the connection anyway. This option supersedes ``_$_s_s_l___s_t_a_r_t_t_l_s (section
-       7.4.302  , page 158)''.
+       7.4.303  , page 158)''.
 
-       _7_._4_._3_0_1  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
+       _7_._4_._3_0_2  _s_s_l___m_i_n___d_h___p_r_i_m_e___b_i_t_s
 
        Type: number
 
@@ -8384,12 +8400,13 @@
        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.
 
        The Mutt Next Generation E-Mail Client                                      159
 
-       _7_._4_._3_0_2  _s_s_l___s_t_a_r_t_t_l_s
+       any Diffie-Hellman key exchange. A value of 0 will use the default from the
+       GNUTLS library.
+
+       _7_._4_._3_0_3  _s_s_l___s_t_a_r_t_t_l_s
 
        Type: quadoption
 
@@ -8401,7 +8418,7 @@
        ing the capability. When _u_n_s_e_t, Mutt-ng will not attempt to use STARTTLS
        regardless of the server's capabilities.
 
-       _7_._4_._3_0_3  _s_s_l___u_s_e___s_s_l_v_2
+       _7_._4_._3_0_4  _s_s_l___u_s_e___s_s_l_v_2
 
        Type: boolean
 
@@ -8412,7 +8429,7 @@
        This variables specifies whether to attempt to use SSLv2 in the SSL authentica-
        tion process.
 
-       _7_._4_._3_0_4  _s_s_l___u_s_e___s_s_l_v_3
+       _7_._4_._3_0_5  _s_s_l___u_s_e___s_s_l_v_3
 
        Type: boolean
 
@@ -8423,7 +8440,7 @@
        This variables specifies whether to attempt to use SSLv3 in the SSL authentica-
        tion process.
 
-       _7_._4_._3_0_5  _s_s_l___u_s_e___t_l_s_v_1
+       _7_._4_._3_0_6  _s_s_l___u_s_e___t_l_s_v_1
 
        Type: boolean
 
@@ -8434,28 +8451,27 @@
        This variables specifies whether to attempt to use TLSv1 in the SSL authentica-
        tion process.
 
-       _7_._4_._3_0_6  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
+       _7_._4_._3_0_7  _s_s_l___u_s_e_s_y_s_t_e_m_c_e_r_t_s
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      160
+
        Availability: SSL
 
        If set to _y_e_s, Mutt-ng will use CA certificates in the system-wide certificate
-
-       The Mutt Next Generation E-Mail Client                                      160
-
        store when checking if server certificate is signed by a trusted CA.
 
-       _7_._4_._3_0_7  _s_t_a_t_u_s___c_h_a_r_s
+       _7_._4_._3_0_8  _s_t_a_t_u_s___c_h_a_r_s
 
        Type: string
 
        Default: '-*%A'
 
        Controls the characters used by the ``%r'' indicator in ``_$_s_t_a_t_u_s___f_o_r_m_a_t (sec-
-       tion 7.4.308  , page 160)''. The first character is used when the mailbox is
+       tion 7.4.309  , page 160)''. The first character is used when the mailbox is
        unchanged. The second is used when the mailbox has been changed, and it needs
        to be resynchronized. The third is used if the mailbox is in read-only mode, or
        if the mailbox will not be written when exiting that mailbox (You can toggle
@@ -8464,7 +8480,7 @@
        been opened in attach-message mode (Certain operations like composing a new
        mail, replying, forwarding, etc. are not permitted in this mode).
 
-       _7_._4_._3_0_8  _s_t_a_t_u_s___f_o_r_m_a_t
+       _7_._4_._3_0_9  _s_t_a_t_u_s___f_o_r_m_a_t
 
        Type: string
 
@@ -8497,12 +8513,12 @@
              %l
                    size (in bytes) of the current mailbox *
 
+       The Mutt Next Generation E-Mail Client                                      161
+
              %L
                    size (in bytes) of the messages shown (i.e., which match the cur-
                    rent limit) *
 
-       The Mutt Next Generation E-Mail Client                                      161
-
              %m
                    the number of messages in the mailbox *
 
@@ -8524,13 +8540,13 @@
 
              %r
                    modified/read-only/won't-write/attach-message indicator, according
-                   to _$_s_t_a_t_u_s___c_h_a_r_s (section 7.4.307  , page 159)
+                   to _$_s_t_a_t_u_s___c_h_a_r_s (section 7.4.308  , page 159)
 
              %s
-                   current sorting mode (_$_s_o_r_t (section 7.4.291  , page 155))
+                   current sorting mode (_$_s_o_r_t (section 7.4.292  , page 155))
 
              %S
-                   current aux sorting method (_$_s_o_r_t___a_u_x (section 7.4.293  , page
+                   current aux sorting method (_$_s_o_r_t___a_u_x (section 7.4.294  , page
                    156))
 
              %t
@@ -8553,13 +8569,12 @@
 
        * = can be optionally printed if nonzero
 
+       The Mutt Next Generation E-Mail Client                                      162
+
        Some of the above sequences can be used to optionally print a string if their
        value is nonzero.  For example, you may only want to see the number of flagged
        messages if such messages exist, since zero is not particularly meaningful.  To
        optionally print a string based upon one of the above sequences, the following
-
-       The Mutt Next Generation E-Mail Client                                      162
-
        construct is used
 
        %?<sequence_char>?<optional_string>?
@@ -8590,7 +8605,7 @@
        replace any dots in the expansion by underscores. This might be helpful with
        IMAP folders that don't like dots in folder names.
 
-       _7_._4_._3_0_9  _s_t_a_t_u_s___o_n___t_o_p
+       _7_._4_._3_1_0  _s_t_a_t_u_s___o_n___t_o_p
 
        Type: boolean
 
@@ -8599,7 +8614,7 @@
        Setting this variable causes the ``status bar'' to be displayed on the first
        line of the screen rather than near the bottom.
 
-       _7_._4_._3_1_0  _s_t_r_i_c_t___m_a_i_l_t_o
+       _7_._4_._3_1_1  _s_t_r_i_c_t___m_a_i_l_t_o
 
        Type: boolean
 
@@ -8610,13 +8625,14 @@
        ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98)'' is unset.
 
        If this variable is _s_e_t, mutt-ng is strict and allows anything to be changed.
+
+       The Mutt Next Generation E-Mail Client                                      163
+
        If it's _u_n_s_e_t, all headers given will be prefixed with ``X-Mailto-'' and the
        message including headers will be shown in the editor regardless of what
        ``_$_e_d_i_t___h_e_a_d_e_r_s (section 7.4.54  , page 98)'' is set to.
 
-       The Mutt Next Generation E-Mail Client                                      163
-
-       _7_._4_._3_1_1  _s_t_r_i_c_t___m_i_m_e
+       _7_._4_._3_1_2  _s_t_r_i_c_t___m_i_m_e
 
        Type: boolean
 
@@ -8631,52 +8647,52 @@
        a single space to prevent the display of MIME-encoded ``Subject:'' header field
        from being devided into multiple lines.
 
-       _7_._4_._3_1_2  _s_t_r_i_c_t___t_h_r_e_a_d_s
+       _7_._4_._3_1_3  _s_t_r_i_c_t___t_h_r_e_a_d_s
 
        Type: boolean
 
        Default: no
 
        If _s_e_t, threading will only make use of the ``In-Reply-To:'' and ``Refer-
-       ences:'' header fields when you ``_$_s_o_r_t (section 7.4.291  , page 155)'' by mes-
+       ences:'' header fields when you ``_$_s_o_r_t (section 7.4.292  , page 155)'' by mes-
        sage threads.  By default, messages with the same subject are grouped together
        in ``pseudo threads.''  This may not always be desirable, such as in a personal
        mailbox where you might have several unrelated messages with the subject ``hi''
        which will get grouped together.
 
-       _7_._4_._3_1_3  _s_t_r_i_p___w_a_s
+       _7_._4_._3_1_4  _s_t_r_i_p___w_a_s
 
        Type: boolean
 
        Default: no
 
        When _s_e_t, mutt-ng will remove the trailing part of the ``Subject:'' line which
-       matches _$_s_t_r_i_p___w_a_s___r_e_g_e_x (section 7.4.314  , page 163) when replying. This is
+       matches _$_s_t_r_i_p___w_a_s___r_e_g_e_x (section 7.4.315  , page 163) when replying. This is
        useful to properly react on subject changes and reduce ``subject noise.'' (esp.
        in Usenet)
 
-       _7_._4_._3_1_4  _s_t_r_i_p___w_a_s___r_e_g_e_x
+       _7_._4_._3_1_5  _s_t_r_i_p___w_a_s___r_e_g_e_x
 
        Type: regular expression
 
        Default: '\([Ww][Aa][RrSs]: .*\)[ ]*$'
 
-       When non-empty and _$_s_t_r_i_p___w_a_s (section 7.4.313  , page 163) is _s_e_t, mutt-ng
+       When non-empty and _$_s_t_r_i_p___w_a_s (section 7.4.314  , page 163) is _s_e_t, mutt-ng
        will remove this trailing part of the ``Subject'' line when replying if it
        won't be empty afterwards.
 
-       _7_._4_._3_1_5  _s_t_u_f_f___q_u_o_t_e_d
+       The Mutt Next Generation E-Mail Client                                      164
+
+       _7_._4_._3_1_6  _s_t_u_f_f___q_u_o_t_e_d
 
        Type: boolean
 
        Default: no
 
-       The Mutt Next Generation E-Mail Client                                      164
-
        If _s_e_t, attachments with flowed format will have their quoting ``stuffed'',
        i.e. a space will be inserted between the quote characters and the actual text.
 
-       _7_._4_._3_1_6  _s_u_s_p_e_n_d
+       _7_._4_._3_1_7  _s_u_s_p_e_n_d
 
        Type: boolean
 
@@ -8686,7 +8702,7 @@
        usually CTRL+Z. This is useful if you run Mutt-ng inside an xterm using a com-
        mand like ``xterm -e muttng.''
 
-       _7_._4_._3_1_7  _t_e_x_t___f_l_o_w_e_d
+       _7_._4_._3_1_8  _t_e_x_t___f_l_o_w_e_d
 
        Type: boolean
 
@@ -8700,7 +8716,7 @@
        Note that _$_i_n_d_e_n_t___s_t_r_i_n_g (section 7.4.109  , page 111) is ignored when this
        option is set.
 
-       _7_._4_._3_1_8  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
+       _7_._4_._3_1_9  _t_h_o_r_o_u_g_h___s_e_a_r_c_h
 
        Type: boolean
 
@@ -8711,7 +8727,7 @@
        to be searched are decoded before searching.  If _u_n_s_e_t, messages are searched
        as they appear in the folder.
 
-       _7_._4_._3_1_9  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
+       _7_._4_._3_2_0  _t_h_r_e_a_d___r_e_c_e_i_v_e_d
 
        Type: boolean
 
@@ -8720,19 +8736,18 @@
        When _s_e_t, Mutt-ng uses the date received rather than the date sent to thread
        messages by subject.
 
-       _7_._4_._3_2_0  _t_i_l_d_e
+       The Mutt Next Generation E-Mail Client                                      165
+
+       _7_._4_._3_2_1  _t_i_l_d_e
 
        Type: boolean
 
        Default: no
 
        When _s_e_t, the internal-pager will pad blank lines to the bottom of the screen
-
-       The Mutt Next Generation E-Mail Client                                      165
-
        with a tilde (~).
 
-       _7_._4_._3_2_1  _t_i_m_e_o_u_t
+       _7_._4_._3_2_2  _t_i_m_e_o_u_t
 
        Type: number
 
@@ -8742,7 +8757,7 @@
        pressed in the main menu before timing out and checking for new mail.  A value
        of zero or less will cause Mutt-ng to never time out.
 
-       _7_._4_._3_2_2  _t_m_p_d_i_r
+       _7_._4_._3_2_3  _t_m_p_d_i_r
 
        Type: path
 
@@ -8753,7 +8768,7 @@
        set, the environment variable $TMPDIR is used.  If $TMPDIR is not set then
        '/tmp' is used.
 
-       _7_._4_._3_2_3  _t_o___c_h_a_r_s
+       _7_._4_._3_2_4  _t_o___c_h_a_r_s
 
        Type: string
 
@@ -8769,7 +8784,7 @@
        indicate mail that was sent by _y_o_u.  The sixth character is used to indicate
        when a mail was sent to a mailing-list you're subscribe to (default: L).
 
-       _7_._4_._3_2_4  _t_r_a_s_h
+       _7_._4_._3_2_5  _t_r_a_s_h
 
        Type: path
 
@@ -8778,15 +8793,15 @@
        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                                      166
+
        NNoottee: When you delete a message in the trash folder, it is really deleted, so
        that there is no way to recover mail.
 
-       _7_._4_._3_2_5  _t_u_n_n_e_l
+       _7_._4_._3_2_6  _t_u_n_n_e_l
 
        Type: string
 
-       The Mutt Next Generation E-Mail Client                                      166
-
        Default: ''
 
        Setting this variable will cause Mutt-ng to open a pipe to a command instead of
@@ -8798,7 +8813,7 @@
        NNoottee:: For this example to work you must be able to log in to the remote machine
        without having to enter a password.
 
-       _7_._4_._3_2_6  _u_m_a_s_k
+       _7_._4_._3_2_7  _u_m_a_s_k
 
        Type: number
 
@@ -8807,7 +8822,7 @@
        This sets the umask that will be used by Mutt-ng when creating all kinds of
        files. If _u_n_s_e_t, the default value is 077.
 
-       _7_._4_._3_2_7  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
+       _7_._4_._3_2_8  _u_n_c_o_l_l_a_p_s_e___j_u_m_p
 
        Type: boolean
 
@@ -8816,7 +8831,7 @@
        When _s_e_t, Mutt-ng will jump to the next unread message, if any, when the cur-
        rent thread is _u_ncollapsed.
 
-       _7_._4_._3_2_8  _u_s_e___8_b_i_t_m_i_m_e
+       _7_._4_._3_2_9  _u_s_e___8_b_i_t_m_i_m_e
 
        Type: boolean
 
@@ -8831,19 +8846,19 @@
        145)'' with the -B8BITMIME flag when sending 8-bit messages to enable ESMTP
        negotiation or tell libESMTP to do so.
 
-       _7_._4_._3_2_9  _u_s_e___d_o_m_a_i_n
+       _7_._4_._3_3_0  _u_s_e___d_o_m_a_i_n
 
        Type: boolean
 
+       The Mutt Next Generation E-Mail Client                                      167
+
        Default: yes
 
        When _s_e_t, Mutt-ng will qualify all local addresses (ones without the @host por-
        tion) with the value of ``_$_h_o_s_t_n_a_m_e (section 7.4.89  , page 106)''.  If _u_n_s_e_t,
        no addresses will be qualified.
 
-       The Mutt Next Generation E-Mail Client                                      167
-
-       _7_._4_._3_3_0  _u_s_e___f_r_o_m
+       _7_._4_._3_3_1  _u_s_e___f_r_o_m
 
        Type: boolean
 
@@ -8853,7 +8868,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.
 
-       _7_._4_._3_3_1  _u_s_e___i_d_n
+       _7_._4_._3_3_2  _u_s_e___i_d_n
 
        Type: boolean
 
@@ -8866,7 +8881,7 @@
        NNoottee:: You can use IDNs for addresses even if this is _u_n_s_e_t.  This variable only
        affects decoding.
 
-       _7_._4_._3_3_2  _u_s_e___i_p_v_6
+       _7_._4_._3_3_3  _u_s_e___i_p_v_6
 
        Type: boolean
 
@@ -8876,7 +8891,7 @@
        If this option is _u_n_s_e_t, Mutt-ng will restrict itself to IPv4 addresses.  Nor-
        mally, the default should work.
 
-       _7_._4_._3_3_3  _u_s_e_r___a_g_e_n_t
+       _7_._4_._3_3_4  _u_s_e_r___a_g_e_n_t
 
        Type: boolean
 
@@ -8885,21 +8900,21 @@
        When _s_e_t, Mutt-ng will add a ``User-Agent:'' header to outgoing messages, indi-
        cating which version of Mutt-ng was used for composing them.
 
-       _7_._4_._3_3_4  _v_i_s_u_a_l
+       _7_._4_._3_3_5  _v_i_s_u_a_l
 
        Type: path
 
        Default: ''
 
+       The Mutt Next Generation E-Mail Client                                      168
+
        Specifies the visual editor to invoke when the _~_v command is given in the
        builtin editor.
 
-       _7_._4_._3_3_5  _w_a_i_t___k_e_y
+       _7_._4_._3_3_6  _w_a_i_t___k_e_y
 
        Type: boolean
 
-       The Mutt Next Generation E-Mail Client                                      168
-
        Default: yes
 
        Controls whether Mutt-ng will ask you to press a key after _s_h_e_l_l_- _e_s_c_a_p_e, _p_i_p_e_-
@@ -8912,7 +8927,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.
 
-       _7_._4_._3_3_6  _w_e_e_d
+       _7_._4_._3_3_7  _w_e_e_d
 
        Type: boolean
 
@@ -8921,7 +8936,7 @@
        When _s_e_t, Mutt-ng will weed headers when displaying, forwarding, printing, or
        replying to messages.
 
-       _7_._4_._3_3_7  _w_r_a_p___s_e_a_r_c_h
+       _7_._4_._3_3_8  _w_r_a_p___s_e_a_r_c_h
 
        Type: boolean
 
@@ -8932,7 +8947,7 @@
        When _s_e_t, searches will wrap around the first (or last) message. When _u_n_s_e_t,
        searches will not wrap.
 
-       _7_._4_._3_3_8  _w_r_a_p_m_a_r_g_i_n
+       _7_._4_._3_3_9  _w_r_a_p_m_a_r_g_i_n
 
        Type: number
 
@@ -8941,21 +8956,21 @@
        Controls the size of the margin remaining at the right side of the terminal
        when Mutt-ng's pager does smart wrapping.
 
-       _7_._4_._3_3_9  _w_r_i_t_e___b_c_c
+       _7_._4_._3_4_0  _w_r_i_t_e___b_c_c
 
        Type: boolean
 
        Default: yes
 
+       The Mutt Next Generation E-Mail Client                                      169
+
        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.
 
-       _7_._4_._3_4_0  _w_r_i_t_e___i_n_c
+       _7_._4_._3_4_1  _w_r_i_t_e___i_n_c
 
        Type: number
 
-       The Mutt Next Generation E-Mail Client                                      169
-
        Default: 10
 
        When writing a mailbox, a message will be printed every _w_r_i_t_e___i_n_c messages to
@@ -8964,23 +8979,23 @@
 
        Also see the ``_$_r_e_a_d___i_n_c (section 7.4.227  , page 140)'' variable.
 
-       _7_._4_._3_4_1  _x_t_e_r_m___i_c_o_n
+       _7_._4_._3_4_2  _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 7.4.343  , page 169) is _s_e_t. This string is identical in formatting to the
-       one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  , page 160)''.
+       tion 7.4.344  , page 169) is _s_e_t. This string is identical in formatting to the
+       one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.309  , page 160)''.
 
-       _7_._4_._3_4_2  _x_t_e_r_m___l_e_a_v_e
+       _7_._4_._3_4_3  _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 7.4.343  , page 169) is _s_e_t, this string will be
+       If _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.344  , page 169) is _s_e_t, this string will be
        used to set the title when leaving mutt-ng. For terminal-based programs,
        there's no easy and portable way to read the current title so mutt-ng cannot
        read it upon startup and restore it when exiting.
@@ -8990,7 +9005,7 @@
        set xterm_leave = '`test x$DISPLAY != x && xprop -id $WINDOWID | grep WM_NAME |
        cut -d ''' -f 2`'
 
-       _7_._4_._3_4_3  _x_t_e_r_m___s_e_t___t_i_t_l_e_s
+       _7_._4_._3_4_4  _x_t_e_r_m___s_e_t___t_i_t_l_e_s
 
        Type: boolean
 
@@ -9000,19 +9015,19 @@
        you're in an appropriate terminal). The default must be _u_n_s_e_t to force in the
        validity checking.
 
-       _7_._4_._3_4_4  _x_t_e_r_m___t_i_t_l_e
+       _7_._4_._3_4_5  _x_t_e_r_m___t_i_t_l_e
 
        Type: string
 
+       The Mutt Next Generation E-Mail Client                                      170
+
        Default: 'Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?'
 
        Controls the format of the title bar of the xterm provided that
-       _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.343  , page 169) has been _s_e_t. This string is
-       identical in formatting to the one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.308  ,
+       _$_x_t_e_r_m___s_e_t___t_i_t_l_e_s (section 7.4.344  , page 169) has been _s_e_t. This string is
+       identical in formatting to the one used by ``_$_s_t_a_t_u_s___f_o_r_m_a_t (section 7.4.309  ,
        page 160)''.
 
-       The Mutt Next Generation E-Mail Client                                      170
-
        _7_._5  _F_u_n_c_t_i_o_n_s
 
        The following is the list of available functions listed by the mapping in which
@@ -9059,9 +9074,11 @@
             top-page                   H   move to the top of the page
             what-key           not bound   display the keycode for a key press
 
+       The Mutt Next Generation E-Mail Client                                      171
+
        _7_._5_._2  _i_n_d_e_x
 
-       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
             change-folder              c   open a different folder
@@ -9118,7 +9135,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                                      172
+       The Mutt Next Generation E-Mail Client                                      173
 
             sort-mailbox               o   sort messages
             sort-reverse               O   sort messages in reverse order
@@ -9136,7 +9153,7 @@
 
        _7_._5_._3  _p_a_g_e_r
 
-       The Mutt Next Generation E-Mail Client                                      173
+       The Mutt Next Generation E-Mail Client                                      174
 
             bottom             not bound   jump to the bottom of the message
             bounce-message             b   remail a message to another user
@@ -9193,7 +9210,7 @@
             recall-message             R   recall a postponed message
             redraw-screen             ^L   clear and redraw the screen
 
-       The Mutt Next Generation E-Mail Client                                      174
+       The Mutt Next Generation E-Mail Client                                      175
 
             reply                      r   reply to a message
             save-message               s   save message/attachment to a file
@@ -9233,7 +9250,7 @@
 
        _7_._5_._6  _a_t_t_a_c_h
 
-       The Mutt Next Generation E-Mail Client                                      175
+       The Mutt Next Generation E-Mail Client                                      176
 
             bounce-message             b   remail a message to another user
             collapse-parts             v   toggle display of subparts
@@ -9256,7 +9273,7 @@
 
        _7_._5_._7  _c_o_m_p_o_s_e
 
-       The Mutt Next Generation E-Mail Client                                      176
+       The Mutt Next Generation E-Mail Client                                      177
 
             attach-file                a   attach a file(s) to this message
             attach-message             A   attach message(s) to this message
@@ -9299,7 +9316,7 @@
 
        _7_._5_._9  _b_r_o_w_s_e_r
 
-       The Mutt Next Generation E-Mail Client                                      177
+       The Mutt Next Generation E-Mail Client                                      178
 
             change-dir                 c   change directories
             check-new                TAB   check mailboxes for new mail
@@ -9348,7 +9365,7 @@
 
        _8_.  _M_i_s_c_e_l_l_a_n_y
 
-       The Mutt Next Generation E-Mail Client                                      178
+       The Mutt Next Generation E-Mail Client                                      179
 
        _8_._1  _A_c_k_n_o_w_l_e_d_g_m_e_n_t_s
 
@@ -9405,7 +9422,7 @@
 
        Felix von Leitner (a.k.a ``Fefe'') <leitner@math.fu-berlin.de>,
 
-       The Mutt Next Generation E-Mail Client                                      179
+       The Mutt Next Generation E-Mail Client                                      180
 
        Brandon Long <blong@fiction.net>,
 
@@ -9461,14 +9478,14 @@
 
        Elimar Riesebieter <riesebie@lxtec.de>
 
-       The Mutt Next Generation E-Mail Client                                      180
+       The Mutt Next Generation E-Mail Client                                      181
 
        _8_._2  _A_b_o_u_t _t_h_i_s _d_o_c_u_m_e_n_t
 
        This document was written in SGML, and then rendered using the sgml-tools pack-
        age.
 
-       The Mutt Next Generation E-Mail Client                                      181
+       The Mutt Next Generation E-Mail Client                                      182
 
                                           CONTENTS
 
@@ -9622,7 +9639,7 @@
            7.1   Command line options   ........................................... 79
            7.2   Patterns   ....................................................... 80
            7.3   Configuration Commands   ......................................... 82
-           7.4   Configuration variables   ........................................ 84
+           7.4   Configuration variables .......................................... 84
                  7.4.1    abort_nosubject   85
                  7.4.2    abort_unmodified   86
                  7.4.3    alias_file   86
@@ -9641,12 +9658,12 @@
                  7.4.13   attach_sep   89
                  7.4.14   attach_split   89
                  7.4.15   attribution   89
-                 7.4.16   auto_tag   90
+                 7.4.16   auto_tag   89
                  7.4.17   autoedit   90
                  7.4.18   beep   90
                  7.4.19   beep_new   90
                  7.4.20   bounce   90
-                 7.4.21   bounce_delivered   91
+                 7.4.21   bounce_delivered   90
                  7.4.22   braille_friendly   91
                  7.4.23   certificate_file   91
                  7.4.24   charset   91
@@ -9669,7 +9686,7 @@
                  7.4.41   crypt_timestamp   95
                  7.4.42   crypt_use_gpgme   95
                  7.4.43   crypt_verify_sig   95
-                 7.4.44   date_format   96
+                 7.4.44   date_format   95
                  7.4.45   default_hook   96
                  7.4.46   delete   96
                  7.4.47   delete_untag   96
@@ -9688,7 +9705,7 @@
                  7.4.60   fast_reply   99
                  7.4.61   fcc_attach   99
                  7.4.62   fcc_clear   99
-                 7.4.63   file_charset   100
+                 7.4.63   file_charset   99
 
                                               iv
 
@@ -9696,26 +9713,26 @@
                  7.4.65   folder_format   100
                  7.4.66   followup_to   101
                  7.4.67   force_buffy_check   101
-                 7.4.68   force_name   102
+                 7.4.68   force_name   101
                  7.4.69   forward_decode   102
                  7.4.70   forward_decrypt   102
                  7.4.71   forward_edit   102
                  7.4.72   forward_format   102
-                 7.4.73   forward_quote   103
+                 7.4.73   forward_quote   102
                  7.4.74   from   103
                  7.4.75   gecos_mask   103
                  7.4.76   hdrs   103
-                 7.4.77   header   104
+                 7.4.77   header   103
                  7.4.78   header_cache   104
                  7.4.79   header_cache_compress   104
                  7.4.80   help   104
-                 7.4.81   hidden_host   105
+                 7.4.81   hidden_host   104
                  7.4.82   hide_limited   105
                  7.4.83   hide_missing   105
                  7.4.84   hide_thread_subject   105
                  7.4.85   hide_top_limited   105
                  7.4.86   hide_top_missing   105
-                 7.4.87   history   106
+                 7.4.87   history   105
                  7.4.88   honor_followup_to   106
                  7.4.89   hostname   106
                  7.4.90   ignore_list_reply_to   106
@@ -9723,28 +9740,28 @@
                  7.4.92   imap_check_subscribed   107
                  7.4.93   imap_delim_chars   107
                  7.4.94   imap_headers   107
-                 7.4.95   imap_home_namespace   108
+                 7.4.95   imap_home_namespace   107
                  7.4.96   imap_keepalive   108
                  7.4.97   imap_list_subscribed   108
                  7.4.98   imap_login   108
-                 7.4.99   imap_mail_check   109
+                 7.4.99   imap_mail_check   108
                  7.4.100  imap_pass   109
                  7.4.101  imap_passive   109
                  7.4.102  imap_peek   109
-                 7.4.103  imap_reconnect   110
+                 7.4.103  imap_reconnect   109
                  7.4.104  imap_servernoise   110
                  7.4.105  imap_user   110
                  7.4.106  implicit_autoview   110
                  7.4.107  include   110
-                 7.4.108  include_onlyfirst   111
+                 7.4.108  include_onlyfirst   110
                  7.4.109  indent_string   111
                  7.4.110  index_format   111
-                 7.4.111  ispell   114
+                 7.4.111  ispell   113
                  7.4.112  keep_flagged   114
                  7.4.113  list_reply   114
                  7.4.114  locale   114
                  7.4.115  mail_check   114
-                 7.4.116  mailcap_path   115
+                 7.4.116  mailcap_path   114
 
                                               v
 
@@ -9757,18 +9774,18 @@
                  7.4.123  max_display_recips   116
                  7.4.124  max_line_length   116
                  7.4.125  mbox   116
-                 7.4.126  mbox_type   117
+                 7.4.126  mbox_type   116
                  7.4.127  menu_context   117
                  7.4.128  menu_move_off   117
                  7.4.129  menu_scroll   117
                  7.4.130  message_format   117
-                 7.4.131  meta_key   118
+                 7.4.131  meta_key   117
                  7.4.132  metoo   118
                  7.4.133  mh_purge   118
                  7.4.134  mh_seq_flagged   118
                  7.4.135  mh_seq_replied   118
                  7.4.136  mh_seq_unseen   118
-                 7.4.137  mime_forward   119
+                 7.4.137  mime_forward   118
                  7.4.138  mime_forward_decode   119
                  7.4.139  mime_forward_rest   119
                  7.4.140  mix_entry_format   119
@@ -9792,12 +9809,12 @@
                  7.4.158  nntp_pass   125
                  7.4.159  nntp_post_moderated   125
                  7.4.160  nntp_reconnect   125
-                 7.4.161  nntp_save_unsubscribed   126
+                 7.4.161  nntp_save_unsubscribed   125
                  7.4.162  nntp_show_new_news   126
                  7.4.163  nntp_show_only_unread   126
                  7.4.164  nntp_user   126
                  7.4.165  nntp_x_comment_to   126
-                 7.4.166  operating_system   127
+                 7.4.166  operating_system   126
                  7.4.167  pager   127
                  7.4.168  pager_context   127
                  7.4.169  pager_format   127
@@ -9808,7 +9825,7 @@
                  7.4.171  pager_stop   128
                  7.4.172  pgp_auto_decode   128
                  7.4.173  pgp_autoinline   128
-                 7.4.174  pgp_check_exit   129
+                 7.4.174  pgp_check_exit   128
                  7.4.175  pgp_clearsign_command   129
                  7.4.176  pgp_decode_command   129
                  7.4.177  pgp_decrypt_command   129
@@ -9820,7 +9837,7 @@
                  7.4.183  pgp_good_sign   131
                  7.4.184  pgp_ignore_subkeys   131
                  7.4.185  pgp_import_command   131
-                 7.4.186  pgp_list_pubring_command   132
+                 7.4.186  pgp_list_pubring_command   131
                  7.4.187  pgp_list_secring_command   132
                  7.4.188  pgp_long_ids   132
                  7.4.189  pgp_mime_auto   132
@@ -9829,11 +9846,11 @@
                  7.4.192  pgp_show_unusable   133
                  7.4.193  pgp_sign_as   133
                  7.4.194  pgp_sign_command   133
-                 7.4.195  pgp_sort_keys   134
+                 7.4.195  pgp_sort_keys   133
                  7.4.196  pgp_strict_enc   134
                  7.4.197  pgp_timeout   134
                  7.4.198  pgp_use_gpg_agent   134
-                 7.4.199  pgp_verify_command   135
+                 7.4.199  pgp_verify_command   134
                  7.4.200  pgp_verify_key_command   135
                  7.4.201  pipe_decode   135
                  7.4.202  pipe_sep   135
@@ -9842,21 +9859,21 @@
                  7.4.205  pop_authenticators   136
                  7.4.206  pop_delete   136
                  7.4.207  pop_host   136
-                 7.4.208  pop_last   137
+                 7.4.208  pop_last   136
                  7.4.209  pop_mail_check   137
                  7.4.210  pop_pass   137
                  7.4.211  pop_reconnect   137
                  7.4.212  pop_user   137
-                 7.4.213  post_indent_string   138
+                 7.4.213  post_indent_string   137
                  7.4.214  postpone   138
                  7.4.215  postponed   138
                  7.4.216  preconnect   138
-                 7.4.217  print   139
+                 7.4.217  print   138
                  7.4.218  print_command   139
                  7.4.219  print_decode   139
                  7.4.220  print_split   139
                  7.4.221  prompt_after   139
-                 7.4.222  query_command   140
+                 7.4.222  query_command   139
 
                                              vii
 
@@ -9864,7 +9881,7 @@
                  7.4.224  quote_empty   140
                  7.4.225  quote_quoted   140
                  7.4.226  quote_regexp   140
-                 7.4.227  read_inc   141
+                 7.4.227  read_inc   140
                  7.4.228  read_only   141
                  7.4.229  realname   141
                  7.4.230  recall   141
@@ -9873,137 +9890,138 @@
                  7.4.233  reply_self   142
                  7.4.234  reply_to   142
                  7.4.235  resolve   142
-                 7.4.236  reverse_alias   143
+                 7.4.236  reverse_alias   142
                  7.4.237  reverse_name   143
                  7.4.238  reverse_realname   143
                  7.4.239  rfc2047_parameters   143
                  7.4.240  save_address   144
                  7.4.241  save_empty   144
                  7.4.242  save_name   144
-                 7.4.243  score   145
+                 7.4.243  score   144
                  7.4.244  score_threshold_delete   145
                  7.4.245  score_threshold_flag   145
                  7.4.246  score_threshold_read   145
                  7.4.247  send_charset   145
-                 7.4.248  sendmail   146
+                 7.4.248  sendmail   145
                  7.4.249  sendmail_wait   146
                  7.4.250  shell   146
                  7.4.251  sidebar_boundary   146
-                 7.4.252  sidebar_delim   147
+                 7.4.252  sidebar_delim   146
                  7.4.253  sidebar_newmail_only   147
                  7.4.254  sidebar_number_format   147
-                 7.4.255  sidebar_shorten_hierarchy   148
+                 7.4.255  sidebar_shorten_hierarchy   147
                  7.4.256  sidebar_visible   148
                  7.4.257  sidebar_width   148
                  7.4.258  sig_dashes   148
                  7.4.259  sig_on_top   148
-                 7.4.260  signature   149
-                 7.4.261  simple_search   149
-                 7.4.262  sleep_time   149
-                 7.4.263  smart_wrap   149
-                 7.4.264  smileys   150
-                 7.4.265  smime_ask_cert_label   150
-                 7.4.266  smime_ca_location   150
-                 7.4.267  smime_certificates   150
-                 7.4.268  smime_decrypt_command   150
-                 7.4.269  smime_decrypt_use_default_key   151
-                 7.4.270  smime_default_key   151
-                 7.4.271  smime_encrypt_command   151
-                 7.4.272  smime_encrypt_with   152
-                 7.4.273  smime_get_cert_command   152
-                 7.4.274  smime_get_cert_email_command   152
-                 7.4.275  smime_get_signer_cert_command   152
+                 7.4.260  signature   148
+                 7.4.261  signoff_string   149
+                 7.4.262  simple_search   149
+                 7.4.263  sleep_time   149
+                 7.4.264  smart_wrap   149
+                 7.4.265  smileys   150
+                 7.4.266  smime_ask_cert_label   150
+                 7.4.267  smime_ca_location   150
+                 7.4.268  smime_certificates   150
+                 7.4.269  smime_decrypt_command   150
+                 7.4.270  smime_decrypt_use_default_key   151
+                 7.4.271  smime_default_key   151
+                 7.4.272  smime_encrypt_command   151
+                 7.4.273  smime_encrypt_with   152
+                 7.4.274  smime_get_cert_command   152
+                 7.4.275  smime_get_cert_email_command   152
 
                                              viii
 
-                 7.4.276  smime_import_cert_command   152
-                 7.4.277  smime_is_default   152
-                 7.4.278  smime_keys   153
-                 7.4.279  smime_pk7out_command   153
-                 7.4.280  smime_sign_command   153
-                 7.4.281  smime_sign_opaque_command   153
-                 7.4.282  smime_timeout   153
-                 7.4.283  smime_verify_command   154
-                 7.4.284  smime_verify_opaque_command   154
-                 7.4.285  smtp_envelope   154
-                 7.4.286  smtp_host   154
-                 7.4.287  smtp_pass   154
-                 7.4.288  smtp_port   155
-                 7.4.289  smtp_use_tls   155
-                 7.4.290  smtp_user   155
-                 7.4.291  sort   155
-                 7.4.292  sort_alias   156
-                 7.4.293  sort_aux   156
-                 7.4.294  sort_browser   157
-                 7.4.295  sort_re   157
-                 7.4.296  spam_separator   157
-                 7.4.297  spoolfile   157
-                 7.4.298  ssl_ca_certificates_file   158
-                 7.4.299  ssl_client_cert   158
-                 7.4.300  ssl_force_tls   158
-                 7.4.301  ssl_min_dh_prime_bits   158
-                 7.4.302  ssl_starttls   159
-                 7.4.303  ssl_use_sslv2   159
-                 7.4.304  ssl_use_sslv3   159
-                 7.4.305  ssl_use_tlsv1   159
-                 7.4.306  ssl_usesystemcerts   159
-                 7.4.307  status_chars   160
-                 7.4.308  status_format   160
-                 7.4.309  status_on_top   162
-                 7.4.310  strict_mailto   162
-                 7.4.311  strict_mime   163
-                 7.4.312  strict_threads   163
-                 7.4.313  strip_was   163
-                 7.4.314  strip_was_regex   163
-                 7.4.315  stuff_quoted   163
-                 7.4.316  suspend   164
-                 7.4.317  text_flowed   164
-                 7.4.318  thorough_search   164
-                 7.4.319  thread_received   164
-                 7.4.320  tilde   164
-                 7.4.321  timeout   165
-                 7.4.322  tmpdir   165
-                 7.4.323  to_chars   165
-                 7.4.324  trash   165
-                 7.4.325  tunnel   165
-                 7.4.326  umask   166
-                 7.4.327  uncollapse_jump   166
-                 7.4.328  use_8bitmime   166
+                 7.4.276  smime_get_signer_cert_command   152
+                 7.4.277  smime_import_cert_command   152
+                 7.4.278  smime_is_default   152
+                 7.4.279  smime_keys   153
+                 7.4.280  smime_pk7out_command   153
+                 7.4.281  smime_sign_command   153
+                 7.4.282  smime_sign_opaque_command   153
+                 7.4.283  smime_timeout   154
+                 7.4.284  smime_verify_command   154
+                 7.4.285  smime_verify_opaque_command   154
+                 7.4.286  smtp_envelope   154
+                 7.4.287  smtp_host   154
+                 7.4.288  smtp_pass   155
+                 7.4.289  smtp_port   155
+                 7.4.290  smtp_use_tls   155
+                 7.4.291  smtp_user   155
+                 7.4.292  sort   156
+                 7.4.293  sort_alias   156
+                 7.4.294  sort_aux   156
+                 7.4.295  sort_browser   157
+                 7.4.296  sort_re   157
+                 7.4.297  spam_separator   157
+                 7.4.298  spoolfile   158
+                 7.4.299  ssl_ca_certificates_file   158
+                 7.4.300  ssl_client_cert   158
+                 7.4.301  ssl_force_tls   158
+                 7.4.302  ssl_min_dh_prime_bits   158
+                 7.4.303  ssl_starttls   159
+                 7.4.304  ssl_use_sslv2   159
+                 7.4.305  ssl_use_sslv3   159
+                 7.4.306  ssl_use_tlsv1   159
+                 7.4.307  ssl_usesystemcerts   159
+                 7.4.308  status_chars   160
+                 7.4.309  status_format   160
+                 7.4.310  status_on_top   162
+                 7.4.311  strict_mailto   162
+                 7.4.312  strict_mime   163
+                 7.4.313  strict_threads   163
+                 7.4.314  strip_was   163
+                 7.4.315  strip_was_regex   163
+                 7.4.316  stuff_quoted   164
+                 7.4.317  suspend   164
+                 7.4.318  text_flowed   164
+                 7.4.319  thorough_search   164
+                 7.4.320  thread_received   164
+                 7.4.321  tilde   165
+                 7.4.322  timeout   165
+                 7.4.323  tmpdir   165
+                 7.4.324  to_chars   165
+                 7.4.325  trash   165
+                 7.4.326  tunnel   166
+                 7.4.327  umask   166
+                 7.4.328  uncollapse_jump   166
 
                                               ix
 
-                 7.4.329  use_domain   166
-                 7.4.330  use_from   167
-                 7.4.331  use_idn   167
-                 7.4.332  use_ipv6   167
-                 7.4.333  user_agent   167
-                 7.4.334  visual   167
-                 7.4.335  wait_key   167
-                 7.4.336  weed   168
-                 7.4.337  wrap_search   168
-                 7.4.338  wrapmargin   168
-                 7.4.339  write_bcc   168
-                 7.4.340  write_inc   168
-                 7.4.341  xterm_icon   169
-                 7.4.342  xterm_leave   169
-                 7.4.343  xterm_set_titles   169
-                 7.4.344  xterm_title   169
+                 7.4.329  use_8bitmime   166
+                 7.4.330  use_domain   166
+                 7.4.331  use_from   167
+                 7.4.332  use_idn   167
+                 7.4.333  use_ipv6   167
+                 7.4.334  user_agent   167
+                 7.4.335  visual   167
+                 7.4.336  wait_key   168
+                 7.4.337  weed   168
+                 7.4.338  wrap_search   168
+                 7.4.339  wrapmargin   168
+                 7.4.340  write_bcc   168
+                 7.4.341  write_inc   169
+                 7.4.342  xterm_icon   169
+                 7.4.343  xterm_leave   169
+                 7.4.344  xterm_set_titles   169
+                 7.4.345  xterm_title   169
            7.5   Functions ....................................................... 170
                  7.5.1    generic   170
-                 7.5.2    index   170
-                 7.5.3    pager   172
-                 7.5.4    alias   174
-                 7.5.5    query   174
-                 7.5.6    attach   174
-                 7.5.7    compose   175
-                 7.5.8    postpone   176
-                 7.5.9    browser   176
-                 7.5.10   pgp   177
-                 7.5.11   editor   177
-
-       8.  Miscellany ............................................................ 177
-           8.1   Acknowledgments ................................................. 178
-           8.2   About this document ............................................. 180
+                 7.5.2    index   171
+                 7.5.3    pager   173
+                 7.5.4    alias   175
+                 7.5.5    query   175
+                 7.5.6    attach   175
+                 7.5.7    compose   176
+                 7.5.8    postpone   177
+                 7.5.9    browser   177
+                 7.5.10   pgp   178
+                 7.5.11   editor   178
+
+       8.  Miscellany ............................................................ 178
+           8.1   Acknowledgments ................................................. 179
+           8.2   About this document ............................................. 181
 
                                               x
 
diff --git a/globals.h b/globals.h
index 9b1d1c1..f6894b3 100644
--- a/globals.h
+++ b/globals.h
@@ -138,6 +138,7 @@ WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
 WHERE char *Signature;
+WHERE char *SignOffString;
 WHERE char *SimpleSearch;
 
 #if defined(USE_LIBESMTP)
diff --git a/init.h b/init.h
index d1250cd..1e13e52 100644
--- a/init.h
+++ b/init.h
@@ -3124,7 +3124,16 @@ struct option_t MuttVars[] = {
    ** assumed that filename is a shell command and input should be read from
    ** its stdout.
    */
-  {"signoff_string", DT_SYN, R_NONE, UL "post_indent_string", 0},
+  {"signoff_string", DT_STR, R_NONE, UL &SignOffString, UL 0},
+  /*
+   ** .pp
+   ** If \fIset\fP, this string will be inserted before the signature. This is useful
+   ** for people that want to sign off every message they send with their name.
+   ** .pp
+   ** If you want to insert your website's URL, additional contact information or 
+   ** witty quotes into your mails, better use a signature file instead of
+   ** the signoff string.
+   */
   {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, UL "~f %s | ~s %s"},
   /*
    ** .pp
diff --git a/send.c b/send.c
index a6da714..3b17228 100644
--- a/send.c
+++ b/send.c
@@ -56,9 +56,15 @@ static void append_signature (FILE * f)
   FILE *tmpfp;
   pid_t thepid;
 
+  if (SignOffString) {
+    fprintf (f, "\n%s", SignOffString);
+  }
+
   if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
+    else if (SignOffString)
+      fputs ("\n", f);
     mutt_copy_stream (tmpfp, f);
     fclose (tmpfp);
     if (thepid != -1)
@@ -429,6 +435,7 @@ void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out)
   if (PostIndentString) {
     mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
     fputs (buffer, out);
+    fputc ('\n', out);
   }
 }