More progress on the email front.  Almost there.