Fix encoding in extracting html and text parts of email for display