refactor mail fixups
add a header when body speaks of an attachment