fix the conflict in mailcraft