Initial work on email integration