Merge ""new message from" in conversation view on update" into jb-ub-mail