Fix mail call