* Various changes to begin work on support for MIME messages