Fix mail problem