Improve mail send action