Fix navigation between messages - refs #7402