Further changes for bullseye compatibility, which were applied during update of mail.fsmpi.
mail.fsmpi
