Service Mail Improvements