fixed mapper and e-mail templates