Issues to fix email breakages caused by upgrades (regression)

Related, but unsure if an issue of its own or just a symptom only showing up in an undesired way due to above issues: “Subdomain emails are redirected to main domain ”.