Add ability to close existing messages