Add a mail plugin manager
CS fix