Merge "Follow-up to MimeMessage efficiency improvements."