Merge "Fix how we determine the quoted text offset." into jb-ub-mail