diff --git a/etemplate/inc/class.etemplate_table_test.inc.php b/etemplate/inc/class.etemplate_table_test.inc.php
new file mode 100644
index 0000000000..fe6c01764e
--- /dev/null
+++ b/etemplate/inc/class.etemplate_table_test.inc.php
@@ -0,0 +1,14 @@
+<?php
+class etemplate_table_test
+{
+	var $public_functions = array(
+		'index' => true,
+	);
+
+	function index(array $content=null, $msg='')
+	{
+		$tmpl = new etemplate_new('etemplate.table_test');
+		$content = array();
+		$tmpl->exec('etemplate.etemplate_table_test.index', $content);
+	}
+}
diff --git a/etemplate/js/et2_widget_grid.js b/etemplate/js/et2_widget_grid.js
index 9d6aa2f54f..23dc1423db 100644
--- a/etemplate/js/et2_widget_grid.js
+++ b/etemplate/js/et2_widget_grid.js
@@ -62,10 +62,14 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 	 */
 	init: function() {
 		// Create the table body and the table
-		this.tbody = $j(document.createElement("tbody"));
 		this.table = $j(document.createElement("table"))
 			.addClass("et2_grid");
-		this.table.append(this.tbody);
+		this.thead = $j(document.createElement("thead"))
+			.appendTo(this.table);
+		this.tfoot = $j(document.createElement("tfoot"))
+			.appendTo(this.table);
+		this.tbody = $j(document.createElement("tbody"))
+			.appendTo(this.table);
 
 		// Call the parent constructor
 		this._super.apply(this, arguments);
@@ -180,7 +184,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 				colDataEntry["class"] = et2_readAttrWithDefault(node, "class", "");
 				colDataEntry["align"] = et2_readAttrWithDefault(node, "align", "");
 				colDataEntry["span"] = et2_readAttrWithDefault(node, "span", "1");
-				
+
 				// Keep any others attributes set, there's no 'column' widget
 				for(var i in node.attributes)
 				{
@@ -212,6 +216,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 				rowDataEntry["class"] = et2_readAttrWithDefault(node, "class", "");
 				rowDataEntry["valign"] = et2_readAttrWithDefault(node, "valign", "");
 				rowDataEntry["span"] = et2_readAttrWithDefault(node, "span", "1");
+				rowDataEntry["part"] = et2_readAttrWithDefault(node, "part", "body");
 
 				var id = et2_readAttrWithDefault(node, "id", "");
 				if(id)
@@ -645,7 +650,23 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 		for (var y = 0; y < h; y++)
 		{
 			var row = _cells[y];
-			var tr = $j(document.createElement("tr")).appendTo(this.tbody)
+			var parent = this.tbody;
+			switch(this.rowData[y]["part"])
+			{
+				case 'header':
+					if (!this.tbody.children().length && !this.tfoot.children().length)
+					{
+						parent = this.thead;
+					}
+					break;
+				case 'footer':
+					if (!this.tbody.children().length)
+					{
+						parent = this.tfoot;
+					}
+					break;
+			}
+			var tr = $j(document.createElement("tr")).appendTo(parent)
 				.addClass(this.rowData[y]["class"]);
 
 			if (this.rowData[y].disabled)
@@ -838,6 +859,8 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 			}
 		}
 		this.managementArray = [];
+		this.thead.empty();
+		this.tfoot.empty();
 		this.tbody.empty();
 
 		// Update array managers
@@ -983,7 +1006,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 		}
 		return ids.join('_');
 	},
-	
+
 	resize: function (_height)
 	{
 		if (typeof this.options != 'undefined' && _height
@@ -1002,7 +1025,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 					this.table.height(this.table.height() + _height );
 				}
 			}
-			
+
 		}
 	}
 });
diff --git a/etemplate/templates/default/table_test.xet b/etemplate/templates/default/table_test.xet
new file mode 100644
index 0000000000..0c6fcc14c7
--- /dev/null
+++ b/etemplate/templates/default/table_test.xet
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+	<template id="etemplate.table_test" template="" lang="" group="0" version="">
+		<grid id="rows" order="first" sort="asc" onsort="alert">
+			<columns>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row part="header">
+					<description value="Header" span="all"/>
+					<description/>
+				</row>
+				<row part="footer">
+					<description value="Footer" span="all"/>
+					<description/>
+				</row>
+				<row class="th">
+					<grid-sortheader label="Col 1 Header" id="first" custom-sort="app.method"/>
+					<grid-sortheader label="Col 2 Header" id="second"/>
+					<description value="Col 3 Header"/>
+				</row>
+				<row class="row">
+					<description id="${row}[first]"/>
+					<description id="${row}[second]"/>
+					<description id="${row}[third]"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file