Added message highlighting