email delivery bug fix attempt