Final (?) fixes to message navigation in topic.