use the from address as envelope sender

[etc/mutt.git] / .mutt / muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 74300abf67f057d63c54e5659ed679e7e956ee1e..29542ac81bd7db2be3dc74d40e36f8afbc7af029 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -34,8 +34,6 @@ set my_confdir="~/.mutt"
 # Type: path
 # Default: "~/.muttrc"
 # 
 # Type: path
 # Default: "~/.muttrc"
 # 

-set alias_file="$my_confdir/aliases"
-source $my_confdir/aliases

 # 
 # The default file in which to save aliases created by the 
 # ``create-alias'' function.
 # 
 # The default file in which to save aliases created by the 
 # ``create-alias'' function.


@@ -207,6 +205,10 @@ source $my_confdir/aliases
 #         (please see the ``attachments'' section for possible speed effects)
 # %>X     right justify the rest of the string and pad with character "X"
 # %|X     pad to the end of the line with character "X"
 #         (please see the ``attachments'' section for possible speed effects)
 # %>X     right justify the rest of the string and pad with character "X"
 # %|X     pad to the end of the line with character "X"

+# %*X     soft-fill with character "X" as pad
+# 
+# 
+# For an explanation of `soft-fill', see the ``$index_format'' documentation.

 # 
 # 
 # set attach_sep="\n"
 # 
 # 
 # set attach_sep="\n"


@@ -359,6 +361,7 @@ set beep=no
 # 
 # 
 # Character set your terminal uses to display and enter textual data.
 # 
 # 
 # Character set your terminal uses to display and enter textual data.

+# It is also the fallback for $send_charset.

 # 
 # 
 # set check_new=yes
 # 
 # 
 # set check_new=yes


@@ -649,9 +652,6 @@ set delete=yes
 # Default: ""
 # 
 # 
 # Default: ""
 # 
 # 

-# Note: you should not enable this unless you are using Sendmail
-# 8.8.x or greater.
-# 

 # This variable sets the request for when notification is returned.  The
 # string consists of a comma separated list (no spaces!) of one or more
 # of the following: never, to never request notification,
 # This variable sets the request for when notification is returned.  The
 # string consists of a comma separated list (no spaces!) of one or more
 # of the following: never, to never request notification,


@@ -661,6 +661,12 @@ set delete=yes
 # 
 # Example: set dsn_notify="failure,delay"
 # 
 # 
 # Example: set dsn_notify="failure,delay"
 # 

+# Note: when using $sendmail for delivery, you should not enable
+# this unless you are either using Sendmail 8.8.x or greater or a MTA
+# providing a sendmail(1)-compatible interface supporting the -N option
+# for DSN. For SMTP delivery, it depends on the server whether DSN is
+# supported or not.
+# 

 # 
 # set dsn_return=""
 #
 # 
 # set dsn_return=""
 #


@@ -669,15 +675,18 @@ set delete=yes
 # Default: ""
 # 
 # 
 # Default: ""
 # 
 # 

-# Note: you should not enable this unless you are using Sendmail
-# 8.8.x or greater.
-# 

 # This variable controls how much of your message is returned in DSN
 # messages.  It may be set to either hdrs to return just the
 # message header, or full to return the full message.
 # 
 # Example: set dsn_return=hdrs
 # 
 # This variable controls how much of your message is returned in DSN
 # messages.  It may be set to either hdrs to return just the
 # message header, or full to return the full message.
 # 
 # Example: set dsn_return=hdrs
 # 

+# Note: when using $sendmail for delivery, you should not enable
+# this unless you are either using Sendmail 8.8.x or greater or a MTA
+# providing a sendmail(1)-compatible interface supporting the -R option
+# for DSN. For SMTP delivery, it depends on the server whether DSN is
+# supported or not.
+# 

 # 
 # set duplicate_threads=yes
 #
 # 
 # set duplicate_threads=yes
 #


@@ -702,6 +711,9 @@ set delete=yes
 # This option allows you to edit the header of your outgoing messages
 # along with the body of your message.
 # 
 # This option allows you to edit the header of your outgoing messages
 # along with the body of your message.
 # 

+# Note that changes made to the References: and Date: headers are
+# ignored for interoperability reasons.
+# 

 set edit_headers=yes
 # 
 # set editor=""
 set edit_headers=yes
 # 
 # set editor=""


@@ -715,7 +727,7 @@ set edit_headers=yes
 # It defaults to the value of the VISUAL, or EDITOR, environment
 # variable, or to the string "/usr/bin/editor" if neither of those are set.
 # 
 # It defaults to the value of the VISUAL, or EDITOR, environment
 # variable, or to the string "/usr/bin/editor" if neither of those are set.
 # 

-set editor="~/coding/mailplate/mailplate --verbose --edit --auto --keep-unknown"
+set editor="mailplate --edit --auto --keep-unknown"

 # 
 # set encode_from=no
 #
 # 
 # set encode_from=no
 #


@@ -777,6 +789,7 @@ set fast_reply=yes
 # This variable controls whether or not attachments on outgoing messages
 # are saved along with the main body of your message.
 # 
 # This variable controls whether or not attachments on outgoing messages
 # are saved along with the main body of your message.
 # 

+set fcc_attach=yes

 # 
 # set fcc_clear=no
 #
 # 
 # set fcc_clear=no
 #


@@ -830,6 +843,10 @@ set folder="~/mail"
 # %u      owner name (or numeric uid, if missing)
 # %>X     right justify the rest of the string and pad with character "X"
 # %|X     pad to the end of the line with character "X"
 # %u      owner name (or numeric uid, if missing)
 # %>X     right justify the rest of the string and pad with character "X"
 # %|X     pad to the end of the line with character "X"

+# %*X     soft-fill with character "X" as pad
+# 
+# 
+# For an explanation of `soft-fill', see the ``$index_format'' documentation.

 # 
 # 
 # set followup_to=yes
 # 
 # 
 # set followup_to=yes


@@ -838,6 +855,7 @@ set folder="~/mail"
 # Type: boolean
 # Default: yes
 # 
 # Type: boolean
 # Default: yes
 # 

+# ## ENABLED BY A DEFAULT HOOK

 # 
 # Controls whether or not the Mail-Followup-To header field is
 # generated when sending mail.  When set, Mutt will generate this
 # 
 # Controls whether or not the Mail-Followup-To header field is
 # generated when sending mail.  When set, Mutt will generate this


@@ -931,7 +949,7 @@ set folder="~/mail"
 # is unset.
 # 
 # Defaults to the contents of the environment variable EMAIL.
 # is unset.
 # 
 # Defaults to the contents of the environment variable EMAIL.

-#
+# 

 set from='martin f krafft <madduck@madduck.net>'
 # 
 # set gecos_mask="^[^,]*"
 set from='martin f krafft <madduck@madduck.net>'
 # 
 # set gecos_mask="^[^,]*"


@@ -1108,9 +1126,20 @@ set history_file="~/.var/mutt/history"
 # Default: ""
 # 
 # 
 # Default: ""
 # 
 # 

-# Specifies the hostname to use after the ``@'' in local e-mail
-# addresses.  This overrides the compile time definition obtained from
-# /etc/resolv.conf.
+# Specifies the fully-qualified hostname of the system mutt is running on
+# containing the host's name and the DNS domain it belongs to. It is used
+# as the domain part (after ``@'') for local email addresses as well as
+# Message-Id headers.
+# 
+# Its value is determined at startup as follows: If the node's name
+# as returned by the uname(3) function contains the hostname and the
+# domain, these are used to construct $hostname. If there is no
+# domain part returned, Mutt will look for a ``domain'' or ``search''
+# line in /etc/resolv.conf to determine the domain. Optionally, Mutt
+# can be compiled with a fixed domain name in which case a detected
+# one is not used.
+# 
+# Also see ``$use_domain'' and ``$hidden_host''.

 # 
 # Note: On Debian systems, the default for this variable is obtained
 # from /etc/mailname when Mutt starts.
 # 
 # Note: On Debian systems, the default for this variable is obtained
 # from /etc/mailname when Mutt starts.


@@ -1136,7 +1165,8 @@ set history_file="~/.var/mutt/history"
 # 
 # 
 # Affects the behaviour of the reply function when replying to
 # 
 # 
 # Affects the behaviour of the reply function when replying to

-# messages from mailing lists.  When set, if the ``Reply-To:'' field is
+# messages from mailing lists (as defined by the ``subscribe'' or
+# ``lists'' commands).  When set, if the ``Reply-To:'' field is

 # set to the same value as the ``To:'' field, Mutt assumes that the
 # ``Reply-To:'' field was set by the mailing list to automate responses
 # to the list, and will ignore this field.  To direct a response to the
 # set to the same value as the ``To:'' field, Mutt assumes that the
 # ``Reply-To:'' field was set by the mailing list to automate responses
 # to the list, and will ignore this field.  To direct a response to the


@@ -1377,6 +1407,9 @@ set include=yes
 # message to which you are replying.  You are strongly encouraged not to
 # change this value, as it tends to agitate the more fanatical netizens.
 # 
 # message to which you are replying.  You are strongly encouraged not to
 # change this value, as it tends to agitate the more fanatical netizens.
 # 

+# This option is a format string, please see the description of
+# ``$index_format'' for supported printf()-style sequences.
+# 

 # 
 # set index_format="%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"
 #
 # 
 # set index_format="%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"
 #


@@ -1404,7 +1437,7 @@ set include=yes
 #         ``date_format'' converted to the local time zone
 # %e      current message number in thread
 # %E      number of messages in current thread
 #         ``date_format'' converted to the local time zone
 # %e      current message number in thread
 # %E      number of messages in current thread

-# %f      entire From: line (address + real name)
+# %f      sender (address + real name), either From: or Return-Path:

 # %F      author name, or recipient name if the message is from you
 # %H      spam attribute(s) of this message
 # %i      message-id of the current message
 # %F      author name, or recipient name if the message is from you
 # %H      spam attribute(s) of this message
 # %i      message-id of the current message


@@ -1446,11 +1479,23 @@ set include=yes
 #         function ``strftime''; a leading bang disables locales.
 # %>X     right justify the rest of the string and pad with character "X"
 # %|X     pad to the end of the line with character "X"
 #         function ``strftime''; a leading bang disables locales.
 # %>X     right justify the rest of the string and pad with character "X"
 # %|X     pad to the end of the line with character "X"

+# %*X     soft-fill with character "X" as pad
+# 
+# 
+# `Soft-fill' deserves some explanation. Normal right-justification
+# will print everything to the left of the %>, displaying padding and
+# the whatever lies to the right only if there's room. By contrast,
+# soft-fill gives priority to the right-hand side, guaranteeing space
+# to display it and showing padding only if there's still room. If
+# necessary, soft-fill will eat text leftwards to make room for
+# rightward text.

 # 
 # 

+# Note that these expandos are supported in 
+# ``save-hook'', ``fcc-hook'' and ``fcc-save-hook'', too.

 # 
 # See also: ``$to_chars''.
 # 
 # 
 # See also: ``$to_chars''.
 # 

-set index_format="%4C %Z %{%b %d} %-15.15F (%?l?%4l&%4c?) %?H?[%H] ?%s"
+#set index_format="%4C %Z %{%b %d} %-15.15F %4c %?H?[%H] ?%s" ## DEFINED BY A DEFAULT HOOK

 # 
 # set ispell="ispell"
 #
 # 
 # set ispell="ispell"
 #


@@ -1493,7 +1538,7 @@ set index_format="%4C %Z %{%b %d} %-15.15F (%?l?%4l&%4c?) %?H?[%H] ?%s"
 # 
 # 
 # This variable configures how often (in seconds) mutt should look for
 # 
 # 
 # This variable configures how often (in seconds) mutt should look for

-# new mail.
+# new mail. Also see the ``$timeout'' variable.

 # 
 # 
 # set mailcap_path=""
 # 
 # 
 # set mailcap_path=""


@@ -1522,21 +1567,6 @@ set index_format="%4C %Z %{%b %d} %-15.15F (%?l?%4l&%4c?) %?H?[%H] ?%s"
 # DOING!
 # 
 # 
 # DOING!
 # 
 # 

-# set maildir_mtime=no
-#
-# Name: maildir_mtime
-# Type: boolean
-# Default: no
-# 
-# 
-# If set, the sort-by-date option in the browser will sort maildirs
-# smartly, not using the mtime of the maildir itself but that of the
-# newest message in the new subdirectory, making the sorting by
-# reverse date much more useful. People with maildirs over NFS may
-# wish to leave this option unset.
-# 
-set maildir_mtime=yes
-# 

 # set header_cache=""
 #
 # Name: header_cache
 # set header_cache=""
 #
 # Name: header_cache


@@ -1551,6 +1581,21 @@ set maildir_mtime=yes
 # caching will be used.
 # 
 set header_cache="~/.var/mutt/header_cache"
 # caching will be used.
 # 
 set header_cache="~/.var/mutt/header_cache"

+#
+# set header_cache_compress=yes
+#
+# Name: header_cache_compress
+# Type: boolean
+# Default: yes
+#
+# When mutt is compiled with qdbm or tokyocabinet as header cache backend,
+# this option determines whether the database will be compressed. Compression
+# results in database files roughly being one fifth of the usual diskspace,
+# but the uncompression can result in a slower opening of cached folder(s)
+# which in general is still much faster than opening non header cached
+# folders.
+#
+set header_cache_compress=no

 # 
 # set maildir_header_cache_verify=yes
 #
 # 
 # set maildir_header_cache_verify=yes
 #


@@ -1565,20 +1610,6 @@ set header_cache="~/.var/mutt/header_cache"
 # 
 set maildir_header_cache_verify=no
 # 
 # 
 set maildir_header_cache_verify=no
 # 

-# set header_cache_pagesize="16384"
-#
-# Name: header_cache_pagesize
-# Type: string
-# Default: "16384"
-# 
-# 
-# When mutt is compiled with either gdbm or bdb4 as the header cache backend,
-# this option changes the database page size.  Too large or too small
-# values can waste space, memory, or CPU time. The default should be more
-# or less optimal for most use cases.
-# 
-set header_cache_pagesize=32768
-# 

 # set maildir_trash=no
 #
 # Name: maildir_trash
 # set maildir_trash=no
 #
 # Name: maildir_trash


@@ -1970,11 +2001,11 @@ set narrow_tree=yes
 # 
 set pager_context=2
 # 
 # 
 set pager_context=2
 # 

-# set pager_format="-%Z- %C/%m: %-20.20n   %s%> -- (%P)"
+# set pager_format="-%Z- %C/%m: %-20.20n   %s%*  -- (%P)"

 #
 # Name: pager_format
 # Type: string
 #
 # Name: pager_format
 # Type: string

-# Default: "-%Z- %C/%m: %-20.20n   %s%> -- (%P)"
+# Default: "-%Z- %C/%m: %-20.20n   %s%*  -- (%P)"

 # 
 # 
 # This variable controls the format of the one-line message ``status''
 # 
 # 
 # This variable controls the format of the one-line message ``status''


@@ -1982,6 +2013,7 @@ set pager_context=2
 # pager.  The valid sequences are listed in the ``$index_format''
 # section.
 # 
 # pager.  The valid sequences are listed in the ``$index_format''
 # section.
 # 

+set pager_format="<%a> %*  %i (%P)"

 # 
 # set pager_index_lines=0
 #
 # 
 # set pager_index_lines=0
 #


@@ -1989,6 +2021,7 @@ set pager_context=2
 # Type: number
 # Default: 0
 # 
 # Type: number
 # Default: 0
 # 

+# ## SET BY A DEFAULT HOOK

 # 
 # 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
 # 
 # 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


@@ -2655,6 +2688,7 @@ set pgp_auto_decode=yes
 # edited. This one points to the location of the private keys.
 # (S/MIME only)
 # 
 # edited. This one points to the location of the private keys.
 # (S/MIME only)
 # 

+set smime_keys="~/.smime/keys"

 # 
 # set smime_ca_location=""
 #
 # 
 # set smime_ca_location=""
 #


@@ -2688,6 +2722,7 @@ set pgp_auto_decode=yes
 # the location of the certificates.
 # (S/MIME only)
 # 
 # the location of the certificates.
 # (S/MIME only)
 # 

+set smime_certificates="~/.smime/certificates"

 # 
 # set smime_decrypt_command=""
 #
 # 
 # set smime_decrypt_command=""
 #


@@ -2849,6 +2884,7 @@ set pgp_auto_decode=yes
 # keyid (the hash-value that OpenSSL generates) to work properly
 # (S/MIME only)
 # 
 # keyid (the hash-value that OpenSSL generates) to work properly
 # (S/MIME only)
 # 

+set smime_default_key="a350124a.0"

 # 
 # set ssl_force_tls=no
 #
 # 
 # set ssl_force_tls=no
 #


@@ -3122,7 +3158,8 @@ set pipe_decode
 # 
 # 
 # Controls whether or not messages are saved in the ``$postponed''
 # 
 # 
 # Controls whether or not messages are saved in the ``$postponed''

-# mailbox when you elect not to send immediately.
+# mailbox when you elect not to send immediately. Also see the
+# ``$recall'' variable.

 # 
 # 
 # set postponed="~/postponed"
 # 
 # 
 # set postponed="~/postponed"


@@ -3181,8 +3218,10 @@ set postponed="=drafts"
 # 
 # 
 # This specifies the command pipe that should be used to print messages.
 # 
 # 
 # This specifies the command pipe that should be used to print messages.

-# 
+
+#set print_command="iconv -s -tlatin1//TRANSLIT | a2ps -=mail -Xlatin1 --title='%D{%Y.%m.%d.%H%M%S}-\$t2-\$t1' -B --borders=no --header='\$t2: \$t1' --left-footer='#?l!%E!#?v|%E|%s./%s#|!' --right-footer='#?l!%s./%s#!#?v|%s./%s#|%E|!' -cl100 -1qP cupspdf"

 set print_command="muttprint"
 set print_command="muttprint"

+

 # 
 # set print_decode=yes
 #
 # 
 # set print_decode=yes
 #


@@ -3246,6 +3285,31 @@ set print_split=yes
 # 
 set query_command="lbdbq"
 # 
 # 
 set query_command="lbdbq"
 # 

+# set query_format="%4c %t %-25.25a %-25.25n %?e?(%e)?"
+#
+# Name: query_format
+# Type: string
+# Default: "%4c %t %-25.25a %-25.25n %?e?(%e)?"
+# 
+# 
+# This variable describes the format of the `query' menu. The
+# following printf-style sequences are understood:
+# 
+# %a      destination address
+# %c      current entry number
+# %e      extra information *
+# %n      destination name
+# %t      ``*'' if current entry is tagged, a space otherwise
+# %>X     right justify the rest of the string and pad with "X"
+# %|X     pad to the end of the line with "X"
+# %*X     soft-fill with character "X" as pad
+# 
+# 
+# For an explanation of `soft-fill', see the ``$index_format'' documentation.
+# 
+# * = can be optionally printed if nonzero, see the ``$status_format'' documentation.
+# 
+# 

 # set quit=yes
 #
 # Name: quit
 # set quit=yes
 #
 # Name: quit


@@ -3365,7 +3429,7 @@ set record="=store"
 # and replying. The default value corresponds to the English "Re:" and
 # the German "Aw:".
 # 
 # and replying. The default value corresponds to the English "Re:" and
 # the German "Aw:".
 # 

-set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|aw|antwort|wg|sgkb):[[:space:]]*)+"
+set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:space:]]*)+"

 # 
 # set reply_self=no
 #
 # 
 # set reply_self=no
 #


@@ -3444,7 +3508,7 @@ set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|aw|antwort|wg|sgkb):[[:space:]]
 # alternates.  If the variable is unset, or the address that would be
 # used doesn't match your alternates, the From: line will use
 # your address on the current machine.
 # alternates.  If the variable is unset, or the address that would be
 # used doesn't match your alternates, the From: line will use
 # your address on the current machine.

-#
+# 

 set reverse_name=yes
 # 
 # set reverse_realname=yes
 set reverse_name=yes
 # 
 # set reverse_realname=yes


@@ -3597,7 +3661,7 @@ set save_history=100
 # Default: "us-ascii:iso-8859-1:utf-8"
 # 
 # 
 # Default: "us-ascii:iso-8859-1:utf-8"
 # 
 # 

-# A list of character sets for outgoing messages. Mutt will use the
+# A colon-delimited list of character sets for outgoing messages. Mutt will use the

 # first character set into which the text can be converted exactly.
 # If your ``$charset'' is not iso-8859-1 and recipients may not
 # understand UTF-8, it is advisable to include in the list an
 # first character set into which the text can be converted exactly.
 # If your ``$charset'' is not iso-8859-1 and recipients may not
 # understand UTF-8, it is advisable to include in the list an


@@ -3605,6 +3669,9 @@ set save_history=100
 # iso-8859-2, koi8-r or iso-2022-jp) either instead of or after
 # "iso-8859-1".
 # 
 # iso-8859-2, koi8-r or iso-2022-jp) either instead of or after
 # "iso-8859-1".
 # 

+# In case the text cannot be converted into one of these exactly,
+# mutt uses ``$charset'' as a fallback.
+# 

 # 
 # set sendmail="/usr/sbin/sendmail -oem -oi"
 #
 # 
 # set sendmail="/usr/sbin/sendmail -oem -oi"
 #


@@ -3618,7 +3685,8 @@ set save_history=100
 # arguments as recipient addresses.
 # 
 #set sendmail="/bin/true"
 # arguments as recipient addresses.
 # 
 #set sendmail="/bin/true"

-#set sendmail="~/.mutt/sendmail"
+set sendmail="~/.mutt/sendmail"
+#set sendmail="/usr/sbin/sendmail -oem -oi"

 # 
 # set sendmail_wait=0
 #
 # 
 # set sendmail_wait=0
 #


@@ -3928,6 +3996,7 @@ set sort_aux=last-date-received
 # automatically set this variable to the value of the environment
 # variable $MAIL if it is not set.
 # 
 # automatically set this variable to the value of the environment
 # variable $MAIL if it is not set.
 # 

+set spoolfile="=inbox"

 # 
 # set status_chars="-*%A"
 #
 # 
 # set status_chars="-*%A"
 #


@@ -3983,7 +4052,10 @@ set sort_aux=last-date-received
 # %V      currently active limit pattern, if any *
 # %>X     right justify the rest of the string and pad with "X"
 # %|X     pad to the end of the line with "X"
 # %V      currently active limit pattern, if any *
 # %>X     right justify the rest of the string and pad with "X"
 # %|X     pad to the end of the line with "X"

+# %*X     soft-fill with character "X" as pad
+# 

 # 
 # 

+# For an explanation of `soft-fill', see the ``$index_format'' documentation.

 # 
 # * = can be optionally printed if nonzero
 # 
 # 
 # * = can be optionally printed if nonzero
 # 


@@ -4022,7 +4094,7 @@ set sort_aux=last-date-received
 # will replace any dots in the expansion by underscores. This might be helpful 
 # with IMAP folders that don't like dots in folder names.
 # 
 # will replace any dots in the expansion by underscores. This might be helpful 
 # with IMAP folders that don't like dots in folder names.
 # 

-set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%?t? t:%t?%?p? p:%p?%?b? i:%b?%?l? %l?]  %?V?[%V]  ?(%s/%S) %> (%P) "
+set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%?t? t:%t?%?p? p:%p?%?b? i:%b?%?l? %l?] %?V?%V ?(%s/%S) %> (%P) "

 # 
 # set status_on_top=no
 #
 # 
 # set status_on_top=no
 #


@@ -4085,6 +4157,7 @@ set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%
 # Type: boolean
 # Default: no
 # 
 # Type: boolean
 # Default: no
 # 

+set thread_received=yes

 # 
 # When set, mutt uses the date received rather than the date sent
 # to thread messages by subject.
 # 
 # When set, mutt uses the date received rather than the date sent
 # to thread messages by subject.


@@ -4114,6 +4187,21 @@ set thorough_search=yes
 # When set, the internal-pager will pad blank lines to the bottom of the
 # screen with a tilde (~).
 # 
 # When set, the internal-pager will pad blank lines to the bottom of the
 # screen with a tilde (~).
 # 

+set tilde=yes
+# 
+# set time_inc=0
+#
+# Name: time_inc
+# Type: number
+# Default: 0
+# 
+# 
+# Along with ``read_inc'', ``write_inc'', and ``net_inc'', this
+# variable controls the frequency with which progress updates are
+# displayed. It suppresses updates less than ``time_inc'' milliseconds
+# apart. This can improve throughput on systems with slow terminals,
+# or when running mutt on a remote system.
+# 

 # 
 # set timeout=600
 #
 # 
 # set timeout=600
 #


@@ -4122,10 +4210,17 @@ set thorough_search=yes
 # Default: 600
 # 
 # 
 # Default: 600
 # 
 # 

-# This variable controls the number of seconds Mutt will wait
-# for a key to be pressed in the main menu before timing out and
-# checking for new mail.  A value of zero or less will cause Mutt
-# to never time out.
+# When Mutt is waiting for user input either idleing in menus or
+# in an interactive prompt, Mutt would block until input is
+# present. Depending on the context, this would prevent certain
+# operations from working, like checking for new mail or keeping
+# an IMAP connection alive.
+# 
+# This variable controls how many seconds Mutt will at most wait
+# until it aborts waiting for input, performs these operations and
+# continues to wait for input.
+# 
+# A value of zero or less will cause Mutt to never time out.

 # 
 # 
 # set tmpdir=""
 # 
 # 
 # set tmpdir=""


@@ -4140,7 +4235,6 @@ set thorough_search=yes
 # this variable is not set, the environment variable TMPDIR is
 # used.  If TMPDIR is not set then "/tmp" is used.
 # 
 # this variable is not set, the environment variable TMPDIR is
 # used.  If TMPDIR is not set then "/tmp" is used.
 # 

-set tmpdir="~/.tmp"

 # 
 # set to_chars=" +TCFL"
 #
 # 
 # set to_chars=" +TCFL"
 #


@@ -4227,14 +4321,17 @@ set tmpdir="~/.tmp"
 # Default: no
 # 
 # 
 # Default: no
 # 
 # 

-# When set, mutt will use ``$envelope_from_address'' as the
-# envelope sender if that is set, otherwise it will attempt to
-# derive it from the "From:" header.  Note that this information is passed 
-# to sendmail command using the "-f" command line switch, so don't set this
-# option if you are using that switch in $sendmail yourself,
-# or if the sendmail on your machine doesn't support that command
-# line switch.
+# When set, mutt will set the envelope sender of the message.
+# If ``$envelope_from_address'' is set, it will be used as the sender
+# address. If not, mutt will attempt to derive the sender from the
+# "From:" header.
+# 
+# Note that this information is passed to sendmail command using the
+# "-f" command line switch. Therefore setting this option is not useful
+# if the ``$sendmail'' variable already contains "-f" or if the
+# executable pointed to by $sendmail doesn't support the "-f" switch.

 # 
 # 

+set use_envelope_from=yes

 # 
 # set use_from=yes
 #
 # 
 # set use_from=yes
 #


@@ -4338,7 +4435,7 @@ set wait_key=no
 # When set to a negative value, mutt will wrap text so that there are $wrap
 # characters of empty space on the right side of the terminal.
 # 
 # When set to a negative value, mutt will wrap text so that there are $wrap
 # characters of empty space on the right side of the terminal.
 # 

-set wrap=80
+set wrap=-10

 # 
 # set wrap_search=yes
 #
 # 
 # set wrap_search=yes
 #


@@ -4432,7 +4529,11 @@ set xterm_set_titles=yes
 set xterm_title="mutt@%h [%?M?%M/?%m, n:%n]%?V? [%V]?"
 # 
 
 set xterm_title="mutt@%h [%?M?%M/?%m, n:%n]%?V? [%V]?"
 # 
 

+auto_view text/html
+#auto_view application/x-gunzip application/x-tar-gz application/x-tar application/x-gtar
+#auto_view application/postscript

 alternative_order text/enriched text/plain text application/postscript image/*
 alternative_order text/enriched text/plain text application/postscript image/*

+mime_lookup application/octet-stream

 
 source $my_confdir/colours
 source $my_confdir/headers
 
 source $my_confdir/colours
 source $my_confdir/headers


@@ -4444,3 +4545,6 @@ source $my_confdir/hooks
 
 set my_mailboxes = `ls ~/.var/offlineimap/mailboxes 2>/dev/null || echo /dev/null`
 source $my_mailboxes
 
 set my_mailboxes = `ls ~/.var/offlineimap/mailboxes 2>/dev/null || echo /dev/null`
 source $my_mailboxes

+
+set alias_file="$my_confdir/aliases"
+source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_file|"