Final tweaks

Robert pointed out I'd introduced a bug.  Also marking get_html_body
and get_text_body as private, as they're unused outside of Message.