Improve mail stuff.