Reply includes HTML attachment in message body

Messages with HTML attachments could have added the first HTML
attachment into the message body in forward/reply.

This had been reported downstream:
https://bugzilla.redhat.com/show_bug.cgi?id=1560567