Merge pull request #4 from apache/improve-email-templates

Update and improve email templates