fixed send_mail as well