Merge "b/14075613. Don't use indices created from html on text/plain strings." into ub-mail-master