Fixup email options and addons