diff --git a/core/htmlsanitizer.class.inc.php b/core/htmlsanitizer.class.inc.php
index 987932c7d..cbb5c8804 100644
--- a/core/htmlsanitizer.class.inc.php
+++ b/core/htmlsanitizer.class.inc.php
@@ -184,9 +184,9 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'table' => array('style', 'width', 'summary', 'align', 'border', 'cellpadding', 'cellspacing'),
 		'thead' => array('style'),
 		'tbody' => array('style'),
-		'tr' => array('style'),
-		'td' => array('style', 'colspan'),
-		'th' => array('style'),
+		'tr' => array('style', 'colspan', 'rowspan'),
+		'td' => array('style', 'colspan', 'rowspan'),
+		'th' => array('style', 'colspan', 'rowspan'),
 		'fieldset' => array('style'),
 		'legend' => array('style'),
 		'font' => array('face', 'color', 'style', 'size'),