Revamp send_mail