small fixes in email

more small fixes on email delivery