diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php
index 50677435..8d9f9c4a 100644
--- a/VKAPI/Handlers/Wall.php
+++ b/VKAPI/Handlers/Wall.php
@@ -50,7 +50,7 @@ final class Wall extends VKAPIRequestHandler
                 "owner_id" => $post->getTargetWall(),
                 "date" => $post->getPublicationTime()->timestamp(),
                 "post_type" => "post",
-                "text" => $post->getText(),
+                "text" => $post->getText(false),
                 "can_edit" => 0, # TODO
                 "can_delete" => $post->canBeDeletedBy($this->getUser()),
                 "can_pin" => $post->canBePinnedBy($this->getUser()),
@@ -214,7 +214,7 @@ final class Wall extends VKAPIRequestHandler
                     "owner_id" => $post->getTargetWall(),
                     "date" => $post->getPublicationTime()->timestamp(),
                     "post_type" => "post",
-                    "text" => $post->getText(),
+                    "text" => $post->getText(false),
                     "can_edit" => 0, # TODO
                     "can_delete" => $post->canBeDeletedBy($user),
                     "can_pin" => $post->canBePinnedBy($user),
diff --git a/Web/Models/Entities/Traits/TRichText.php b/Web/Models/Entities/Traits/TRichText.php
index c8a85e70..edde140b 100644
--- a/Web/Models/Entities/Traits/TRichText.php
+++ b/Web/Models/Entities/Traits/TRichText.php
@@ -75,6 +75,8 @@ trait TRichText
             
             $text = $this->removeZalgo($text);
             $text = nl2br($text);
+        } else {
+            $text = str_replace("\r\n","\n", $text);
         }
         
         if(OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["christian"])