Fixed issue with removing messages