including send_mail fix