Re applied Brandon's change to the email class.