add Bounce Module
Upgrade the mail module
remove templates method