diff --git a/content/lvplanung/stpl-details-dialog.xul.php b/content/lvplanung/stpl-details-dialog.xul.php
index 5861f19f2..58394338d 100644
--- a/content/lvplanung/stpl-details-dialog.xul.php
+++ b/content/lvplanung/stpl-details-dialog.xul.php
@@ -84,11 +84,11 @@ $studiengang->load($stundenplan->studiengang_kz);
 			<rows>
 				<row>
 					<label value="Titel" />
-					<textbox id="stpl-details-dialog-textbox-titel" value="<?php echo htmlentities($stundenplan->titel); ?>"  maxlength="32"/>
+					<textbox id="stpl-details-dialog-textbox-titel" value="<?php echo htmlspecialchars($stundenplan->titel); ?>"  maxlength="32"/>
       			</row>
       			<row>
 					<label value="Anmerkung" />
-					<textbox id="stpl-details-dialog-textbox-anmerkung" value="<?php echo htmlentities($stundenplan->anmerkung); ?>"  maxlength="256"/>
+					<textbox id="stpl-details-dialog-textbox-anmerkung" multiline='true' value="<?php echo htmlspecialchars($stundenplan->anmerkung); ?>"  maxlength="256"/>
       			</row>
 				<row>
 					<spacer />
diff --git a/content/tempusDBDML.php b/content/tempusDBDML.php
index c9f34a6b3..e218ac460 100644
--- a/content/tempusDBDML.php
+++ b/content/tempusDBDML.php
@@ -227,8 +227,8 @@ if(!$error)
 			$stundenplan->ort_kurzbz = $_POST['ort_kurzbz'];
 			$stundenplan->datum = $_POST['datum'];
 			$stundenplan->stunde = $_POST['stunde'];
-			$stundenplan->titel = html_entity_decode($_POST['titel']);
-			$stundenplan->anmerkung = html_entity_decode($_POST['anmerkung']);
+			$stundenplan->titel = htmlspecialchars_decode($_POST['titel']);
+			$stundenplan->anmerkung = htmlspecialchars_decode($_POST['anmerkung']);
 			$stundenplan->fix = ($_POST['fix']=='true'?true:false);
 			$stundenplan->mitarbeiter_uid = $_POST['mitarbeiter_uid'];
 			$stundenplan->updateamum = date('Y-m-d H:i:s');