OA-532 Two correction to fix issues discovered in the core HTML email code.