Fix bug in mail sender, fix bugs in mail layout.