Merge "make sure we properly represent quoted text in drafts." into jb-ub-mail