X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.muttrc;h=5f678c49a615dba347044b2865495b86b51c6311;hb=e845d2f4a95a701960fd9bb9b8a578313bb54011;hp=f0fea2147998e43f2f38fcf7fba5d3fed734ccfd;hpb=f3d5077ad1762c49948e73acf7eebb187dc9134f;p=dotfiles.git

diff --git a/.muttrc b/.muttrc
index f0fea21..5f678c4 100644
--- 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,24 +250,32 @@ 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)$'" "\
+   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|'"
 
-send-hook ~u unmy_hdr Reply-To
-
 send-hook "~L python-announce-list@python\.org" "\
    set followup_to=no; \
    my_hdr Reply-To: Oleg Broytman <phd@phdru.name>; \
    my_hdr Mail-Followup-To: Oleg Broytman <phd@phdru.name>, Python Mailing List <python-list@python.org>"
 
+send-hook "~L cheetahtemplate-announce@lists\.sourceforge\.net" "\
+   set followup_to=no; \
+   my_hdr Reply-To: Oleg Broytman <phd@phdru.name>; \
+   my_hdr Mail-Followup-To: Oleg Broytman <phd@phdru.name>, CheetahTemplate discussion <cheetahtemplate-discuss@lists.sourceforge.net>"
+
+send-hook ~u unmy_hdr Reply-To
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
 # Key bindings
@@ -285,7 +296,7 @@ bind index,pager <Esc>S decode-save
 macro index C \
    <Home><change-folder><Enter> \
    "Go to the first folder with unread messages"
-macro pager C \
+macro pager,attach C \
    <exit><Home><change-folder><Enter> \
    "Go to the first folder with unread messages"
 
@@ -316,13 +327,13 @@ macro pager <Esc>z \
 macro index H \
    <Home><change-folder>!<Enter> \
    "Go to inbox"
-macro pager H \
+macro pager,attach H \
    <exit><Home><change-folder>!<Enter> \
    "Go to inbox"
 macro index M \
    <Home><change-folder>=sent-mail<Enter> \
    "Go to sent-mail"
-macro pager M \
+macro pager,attach M \
    <exit><Home><change-folder>=sent-mail<Enter> \
    "Go to sent-mail"
 
@@ -330,7 +341,7 @@ macro pager M \
 macro index Y \
    <Home><change-folder>=lists/python<Enter> \
    "Go to python"
-macro pager Y \
+macro pager,attach Y \
    <exit><Home><change-folder>=lists/python<Enter> \
    "Go to python"
 
@@ -338,13 +349,13 @@ macro pager Y \
 macro index A \
    <Home><change-folder>=stcnet<Enter> \
    "Go to stcnet inbox"
-macro pager A \
+macro pager,attach A \
    <exit><Home><change-folder>=stcnet<Enter> \
    "Go to stcnet inbox"
 macro index <Esc>a \
    <Home><change-folder>=sent-stcnet<Enter> \
    "Go to sent-stcnet"
-macro pager <Esc>a \
+macro pager,attach <Esc>a \
    <exit><Home><change-folder>=sent-stcnet<Enter> \
    "Go to sent-stcnet"