A bit of refactoring of address routing to preserve addressed list information in order to properly set it as the "From" header if available.