Bugfix: message are being deleted