Index: cprs/branches/tmg-cprs/CPRS-Chart/Templates/fTemplateDialog.pas
===================================================================
--- cprs/branches/tmg-cprs/CPRS-Chart/Templates/fTemplateDialog.pas	(revision 654)
+++ cprs/branches/tmg-cprs/CPRS-Chart/Templates/fTemplateDialog.pas	(revision 655)
@@ -264,4 +264,5 @@
          if(frmTemplateDialog.ModalResult = mrOK) then begin
            GetText(SL, TRUE);     {TRUE = Include embedded fields}
+           {
            if uTemplates.bUsingHTMLMode then begin
               SL.Text := FormatHTMLTags(SL.Text);
@@ -269,4 +270,5 @@
               SL.Text := RemoveHTMLTags(SL.Text);
            end;
+           }
          end else begin
           if (not PreviewMode) and (not frmTemplateDialog.Silent) and (not uInit.TimedOut) then
@@ -380,5 +382,10 @@
   tmp := TStringList.Create;
   try
-    tmp.text := AText;
+    if uTemplates.bUsingHTMLMode then begin   //elh   01/04/10
+      tmp.text := FormatHTMLTags(AText);
+    end else begin
+      tmp.text := RemoveHTMLTags(AText);
+    end;
+    //elh tmp.text := AText;
     CheckBoilerplate4Fields(tmp, CaptionText, PreviewMode);
     AText := tmp.text;