improve email thing