Check in the rest of the email stuff even though we're not going to use it.

I may delete this later, but this was a ton of work so deleting it seems like
such a waste...