Fixed not working mails flag