diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index 0016dfe8..315e1b90 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -21,7 +21,7 @@ N/A
 <?php print __('End') ?>: <b><?php print gmdate("r", $row['End']) ?></b></p>
 
 <p>
-<?php print str_replace("\n", "<br />\n", htmlentities($row['Agenda'])) ?>
+<?php print str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?>
 </p>
 
 <table class="boxSoft" width='100%' cellspacing='0' cellpadding='2'>
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index f734cec5..f64d3834 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -20,11 +20,7 @@
 				<tr>
 					<td class='<?php print $c ?>'><span class='f4'><span class='blue'>
 						<?php
-						if (strlen($row["Agenda"]) >= $prev_Len) {
-							$row["Agenda"] = htmlentities(substr($row["Agenda"], 0, $prev_Len)) . "...";
-						} else {
-							$row["Agenda"] = htmlentities($row["Agenda"]);
-						}
+							$row["Agenda"] = htmlspecialchars(substr($row["Agenda"], 0, $prev_Len));
 						?>
 						<a href='tu.php?id=<?php print $row['ID'] ?>'><?php print $row["Agenda"] ?></a></span></span>
 					</td>