Sylvie c more on mandrill mailers

fixed merge conflicts