.muttrc: change envelope settings in sync with my exim config

diff --git a/.muttrc b/.muttrc
index 5648db16d98c19e2f184de29c9b053777c97b260..e9d46edc664fab7b8efc1a1cb97046d8c58fec26 100644 (file)
--- a/.muttrc
+++ b/.muttrc
@@ -91,6 +91,7 @@ set suspend=no                   # Do not suspend on Ctrl+Z
 set tilde                        # Indicate empty lines in the pager.
 set tmpdir=~/tmp                 # Temporary files aren't stored in public places.
 set use_domain=no                # Don't qualify local addresses with $domain
+set use_envelope_from=yes
 set use_ipv6=no                  # Speed up DNS
 set wait_key=no                  # Do not wait for a key after running external programs, pipes
 
@@ -180,6 +181,7 @@ subscribe (python-(announce|dev|ideas)|.*-(list|sig))@python\.org \
 
 # Restore defaults
 folder-hook .* "\
+   set envelope_from_address="phd@phdru.name"; \
    my_hdr From: Oleg Broytman <phd@phdru.name>; \
    my_hdr Reply-To: Oleg Broytman <phd@phdru.name>; \
    my_hdr X-Url: http://phdru.name/; \
@@ -237,6 +239,7 @@ fcc-hook .* =sent-mail
 
 # Restore defaults
 send-hook .* "\
+   set envelope_from_address="phd@phdru.name"; \
    my_hdr From: Oleg Broytman <phd@phdru.name>; \
    my_hdr Reply-To: Oleg Broytman <phd@phdru.name>; \
    my_hdr X-Url: http://phdru.name/; \
@@ -247,13 +250,16 @@ send-hook "~L '@.*\.(r|s)u$'" "\
    my_hdr Reply-To: Олег Бройтман <phd@phdru.name>; \
    set signature='iconv -f koi8-r ~/mail/signatures/phd@phdru.name-ru|'"
 
-send-hook "~L '@(mail|list|inbox|bk)\.ru'" "\
+send-hook "~L '@(mail|list|inbox|bk|sweb|spaceweb|ulmart)\.ru'" "\
+   set envelope_from_address="phd@mail.ru"; \
+   my_hdr From: Олег Бройтман <phd@mail.ru>; \
    my_hdr Reply-To: Олег Бройтман <phd@mail.ru>; \
    my_hdr X-Url: http://my.mail.ru/mail/phd; \
    set signature='iconv -f koi8-r ~/mail/signatures/phd@mail.ru|'"
 
 send-hook "~L '(@|\.)(((ya|yandex|narod)\.ru)|(yandex\.com)|yandex-team\.ru)$'" "\
-   my_hdr From: Олег Бройтман <phd@phdru.name>; \
+   set envelope_from_address="phd2@yandex.ru"; \
+   my_hdr From: Олег Бройтман <phd2@yandex.ru>; \
    my_hdr Reply-To: Олег Бройтман <phd2@yandex.ru>; \
    my_hdr X-Url: http://phd2.ya.ru/; \
    set signature='iconv -f koi8-r ~/mail/signatures/phd2@yandex.ru|'"