Fixes on emailing