Add email auto-linking, second try ;-)