FREQ-54 email refactor improvements