Fix mail handler keywords