Better test to see if plain text already has HTML part alternative
Remove incorrect specification of utf8, causing message encoding problems