Improve email helpers