Improve mail sending