Fixing message highlighting. Fixes #43.