Fix mails flag not working