Improve mail process