Including success email support
Fixing email message for success emails