changes for mail sending