modified safe_mail app