Merge "Fix positioning of the divider bar when quoted text is missing." into jb-ub-mail