[IMP] Merge email_template with mail addon