Fixes #1100 (closed) and #1109 (closed) and the issue in https://lists.mailman3.org/archives/list/mailman-users@mailman3.org/thread/ADWTZKJHXPC6DPD7H2CJBD5EMG6T6ZSR/.