Fix compatibility with old mail configuration

Previously, the compatibility code wrongly assumed that
delivery_method was always set when using the old mail configuration
format, although it has the default value :smtp.

No OP ticket for this.