Fix more email formatting and Unicode issues