Fix mail enabled environment