Ok....
gram.y is fixed (no more %expect usage)
Using the copyCreateDomainStmt in the proper place.
Evolution is the mail client of choice for different (improved?) mime
headers.
And attached is a regular diff -c, rather than a cvs diff -c.
I updated the poor descriptions of MergeDomainAttributes(). Hopefully
its current and future use is more obvious.
Am I getting close?