From 0980703c4504eea4712fa736c7a79cfd40ab09e5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 11 Dec 2015 20:16:09 -0500
Subject: [PATCH] insertToken fix for message templates

---
 templates/CRM/Admin/Form/MessageTemplates.tpl | 2 +-
 templates/CRM/Mailing/Form/InsertTokens.tpl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/CRM/Admin/Form/MessageTemplates.tpl b/templates/CRM/Admin/Form/MessageTemplates.tpl
index 336c81c422..3bc17cd2c2 100644
--- a/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -68,7 +68,7 @@
         </div><!-- /.crm-accordion-header -->
          <div class="crm-accordion-body">
            <div class="helpIcon" id="helphtml">
-             <input class="crm-token-selector big" data-field="html_message" />
+             <input class="crm-token-selector big" data-field="msg_html" />
              {help id="id-token-html" tplFile=$tplFile isAdmin=$isAdmin file="CRM/Contact/Form/Task/Email.hlp"}
            </div>
                 <div class="clear"></div>
diff --git a/templates/CRM/Mailing/Form/InsertTokens.tpl b/templates/CRM/Mailing/Form/InsertTokens.tpl
index 7ce110ea68..7f94bd13f7 100644
--- a/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -217,7 +217,7 @@ CRM.$(function($) {
     var
       token = $(this).val(),
       field = $(this).data('field');
-    if (field !== 'html_message') {
+    if (field.indexOf('html') < 0) {
       field = textMsgID($(this));
     }
     CRM.wysiwyg.insert('#' + field, token);
-- 
2.25.1