Changed Mail to use deliver vs new initialization.