868 for master (email links)

Resolves #868 for master