[FIX] Don't reset an existing but empty mail.catchall.domain
[MERGE] mail: avoid resetting purposefully empty catchall domain setting, courtesy of Stefan Rijnhart (Therp)