Html email show as text after gmail rewrites email

In any circumstance where gmail actually rewrites the email content e.g. to distribute to group members. It will rewrite the mulipart parts in an incorrect order, resulting in the html part being first instead of last.

We have tracked this down to a superfluous part which atlassian-mail adds to the top of the emails. When removed the emails get rewriten correctly.