Jag/mail addons fixes