Add mailcatcher support for development purposes
Improve email subject lines