Minor changes for mail