updated mail_helper