8.5 Emails Fix

Fixes #466 and, more importantly, closes #495. High priority!