some progress on 2.0.0 email this AM

Got back to the code, finally. Reviewed the 2.0.0 email logic, found some problems and made fixes. Still want to do a bit more cleanup, and then its time to test, test, test. But I think I'm pretty close.

I have a feeling that the conversion logic is going to be just as tough, as it must be able to convert old emails. :-(