! A little rejig and we can show from the message index what topics are being watched - and also begin to introduce this terminology properly.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1317 from Arantor/release-2.1

! A little rejig and we can show from the message index what topics are ...