Thanks for this.
I had a downloaded backup from FBX prior doing a fresh install.
After the install;
- Setup
Name Servicesand restoredLetsEncrypt Certificates - applied your patch,
- revised my DKIM keys on DNS proivder and
- copied my
mailboxesfolder back intovar/mail/*user*/mail/mailboxes.
Mail is in order now.