Fix a bug on mails