Highlight now works for messages :)