Improve mail configuration