Bug fixes on email