Merge "Update compose body." into jb-ub-mail