fixed emailing feature