Improve interoperability with amavis