Commit 55b784f2 fixed this for mail.bitmask.net, but not for demo.bitmask.net. See 55b784f2 This fixes #8843.