Improve charset handling for email
Merge remote-tracking branch 'chiiph/bug/better_charset_handling' into develop