various tweaks to try for MIME compliance