small improvement on email driver