group -group fpp -rx @fppnt.com
 
 set mail_check = 0
-set envelope_from
+set use_envelope_from
 set forward_format = "Fwd: %s"
 set forward_quote = yes
 
 group -group nosign -rx .*@bitbucket.org
 group -group nosign -rx jira@.*atlassian.net
 group -group nosign -rx gitlab.incoming@ultrahaptics.com
-group -group nosign -rx incomming\+.*@.*\.gitlab.com
+group -group nosign -rx .*@incoming.gitlab.com
+group -group nosign -rx .*@reply.github.com
 send-hook .            "set crypt_autosign = yes"
 send-hook "%t nosign"  "set crypt_autosign = no"