Fix mail notification