- Updated emails, Issue #137, Issue #123