diff -r 5841df0ab575 -r dffcbfbc4e59 includes/clientside/tinymce/plugins/template/editor_plugin_src.js
--- a/includes/clientside/tinymce/plugins/template/editor_plugin_src.js	Mon May 05 20:06:37 2008 -0400
+++ b/includes/clientside/tinymce/plugins/template/editor_plugin_src.js	Mon May 05 20:08:44 2008 -0400
@@ -69,6 +69,13 @@
 
 			el = dom.create('div', null, h);
 
+			// Find template element within div
+			n = dom.select('.mceTmpl', el);
+			if (n && n.length > 0) {
+				el = dom.create('div', null);
+				el.appendChild(n[0].cloneNode(true));
+			}
+
 			function hasClass(n, c) {
 				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
 			};