Feature/mail environment