replaced "e-mail" with just "mail" for author and committer