Now using encoded email in references to avoid spam