reorg of email code