some adjustments to the way headers are built for old-style messages
Change mail format to BMADDR@default.  The word default can change.  Also, get rid of the Bitmessage Mail tag in the subject line