Email updates

Fixes #205