Cleaned up email code.