Merge "better handling of wide message content" into jb-ub-mail