changed mail to have everything you need in the file