Fix mail sending