changes in mail helper