LILY-344: no more batches when saving messages