Clean up, add support for mention highlights in MUC