Email Module Changes