X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.muttrc;h=1b15aba49d373a24812c772aafdd09997c0fc85c;hb=fb00ee3d0c57834641388c91fdaae51b1c5d8cbc;hp=86a40fc8e0816da84876cc685b4d51cbfceda3bf;hpb=fb95c7a1bf3c7505d6982c4ed238bef75c67bec2;p=dotfiles.git

diff --git a/.muttrc b/.muttrc
index 86a40fc..1b15aba 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
 
@@ -163,9 +164,9 @@ my_hdr X-Operating-System: Debian GNU/Linux
 #       lists <list-name> [ <list-name> ... ]
 
 subscribe (python-(announce|dev|ideas)|.*-(list|sig))@python\.org \
-   core-workflow@python\.org \
-   .*@moderators\.isc\.org .*@lists\.sourceforge\.net \
+   core-workflow@python\.org .*@moderators\.isc\.org \
    (durus|quixote)-users@mems-exchange\.org pysqlite@lists\.initd\.org \
+   .*@vex.net .*@lists\.sourceforge\.net \
    .*@googlegroups\.com mlug@unixcenter\.ru
 
 #lists
@@ -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,9 +239,13 @@ fcc-hook .* =sent-mail
 
 # Restore defaults
 send-hook .* "\
+   set envelope_from_address="phd@phdru.name"; \
+   set followup_to=yes; \
    my_hdr From: Oleg Broytman <phd@phdru.name>; \
    my_hdr Reply-To: Oleg Broytman <phd@phdru.name>; \
    my_hdr X-Url: http://phdru.name/; \
+   unmy_hdr Mail-Followup-To; \
+   unmy_hdr X-Skip-DKIM-Sig; \
    set signature==signatures/phd@phdru.name"
 
 send-hook "~L '@.*\.(r|s)u$'" "\
@@ -247,24 +253,34 @@ 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|'"
 
-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; \
+   my_hdr X-Skip-DKIM-Sig: mailing list
+
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
 # Key bindings