#8 Fixes for message deletes