Hotfix/oem 168

Final fixes required to divert mail properly.