Added logic so message only deleted if result