changes for mail again