Fix mail plugin