Revert "Revert "Delete messages""

This reverts commit 0a19e7a3214de163b5e81b407aeabe539b334540.