Revert "Revert "Revisão e Fix nos Emails""

This reverts commit 75160040bda9b23dc0e9a065492ab5fc54a6cb37.