New feature #07002: allow return to email template in email template edition