Fix a couple of issues related to composing HTML messages in Thunderbird