fix mails to show
Merge branch 'emails' of https://github.com/hermanos/email into emails
fix conflicts