Added HTML Email and mods