Merge "Mime emails should be sent with UTF-8 charset"