Mike there is an M5 Branch. DO NOT STOP YOUR WORK!!!!!!! Excellent. Can you also make sure it keeps correct byte counts. I was about to refactor this myself to do that.
New MailHeadersImpl is commited. It has left the Mail constructors a bit bloated, but I will get to fixing that next.