Merge "Make sure we follow the ref message if it exists." into jb-ub-mail-ur8