trying to fix restart on deploy
better match mailer
fix test
better practice mailer