I left the email pkg alone; I'm not sure how Barry would like to handle
that.