More fixes on email send