added "mail" tag for logs
Merge branch 'email' into staging