Ad mail templating
Added mock mail server