placed mail usage into branch, revert to before mail addition