Moved some properties of email to properties file