Fix bug #17560 with backward-incompatible API change in rmail-delete-*.