diff --git a/exam/classes/Models/Post/Post.php b/exam/classes/Models/Post/Post.php
index c75d995..f6c7b76 100644
--- a/exam/classes/Models/Post/Post.php
+++ b/exam/classes/Models/Post/Post.php
@@ -70,7 +70,7 @@ class Post implements JsonSerializable
       VALUES(:USR, :CON)"
     );
     $stmt->bindValue(":USR", $user->getID());
-    $stmt->bindValue(":CON", htmlspecialchars($content));
+    $stmt->bindValue(":CON", nl2br(htmlspecialchars($content)));
 
     $stmt->execute();
 
@@ -126,7 +126,7 @@ class Post implements JsonSerializable
       $content = substr(trim($content), 0, 250);
 
       $stmt = $db->prepare("UPDATE egb_gaestebuch SET beitrag = :CON WHERE id = :ID");
-      $stmt->bindValue(":CON", htmlspecialchars($content));
+      $stmt->bindValue(":CON", nl2br(htmlspecialchars($content)));
       $stmt->bindValue(":ID", $this->id);
       try {
         if (!$stmt->execute()) {