Changed email address
Some fixes to mail messages