Improved email stubs, now can receive emails