Fix mail-service handler