We need this for #10574, to make POP the default when persistence is
enabled, and IMAP when persistence is disabled.

Note that we also rename the other patch against TorBirdy to ensure
that they are applied in the correct order.

This patch will be upstreamed in TorBirdy.

Will-fix: #10574