refs #15018 keep layout of email hold like before and correct template in master also