Changed how the message label works