Improve mail processing