Tweaks to SMTP & Email transforms to allow for new folder structure