Adding some more content to the mail class and sorting out the settings