Continuing a more piecemeal approach to this, here's a patch to change the mail source error behavior. I'm floating it for review because it involves removing a user-facing option. If this goes in, should that removal be mentioned in NEWS?