diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 6b7e7aca85..c6b59e0b96 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -35,9 +35,9 @@ if (!isset($GLOBALS['egw_info']))
  *
  * @ToDo supported customized templates stored in DB, currently we only support xet files stored in filesystem
  */
-class etemplate extends etemplate_old {};
-class etemplate_new extends etemplate_widget_template
-//class etemplate extends etemplate_widget_template
+//class etemplate extends etemplate_old {};
+//class etemplate_new extends etemplate_widget_template
+class etemplate extends etemplate_widget_template
 {
 	/**
 	 * Are we running as sitemgr module or not
diff --git a/etemplate/js/et2_widget_historylog.js b/etemplate/js/et2_widget_historylog.js
index 87185b4b7f..31ecc0b6a6 100644
--- a/etemplate/js/et2_widget_historylog.js
+++ b/etemplate/js/et2_widget_historylog.js
@@ -307,7 +307,7 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
 				var jthis = jQuery(this);
 				if(i == 3)
 				{
-					// DIff widget
+					// Diff widget
 					widget = self.diff.widget;
 					nodes = self.diff.nodes.clone();
 
@@ -319,7 +319,7 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
 					// Skip column 4
 					jthis.parents("td").attr("colspan", 2)
 						.css("border-right", "none");
-					jthis.css("width", "100%");
+					jthis.css("width", (self.dataview.columnMgr.columnWidths[i] + self.dataview.columnMgr.columnWidths[i+1]-8)+'px');
 
 					if(widget) widget.setDetachedAttributes(nodes, {
 						value:_data[self.columns[i].id],