Updated the mail sending