Better handling of message deletion. Adding class to widget