Updated Email code.