Merge "Polish and humanize the strings for the preview of mail content." into tm-dev