diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index 09392bc3..96b61b48 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -552,6 +552,7 @@ final class WallPresenter extends OpenVKPresenter
                         "nsfw"        => $this->postParam("type") === "post" ? (int)$post->isExplicit() : 0,
                         "from_group"  => $this->postParam("type") === "post" && $post->getTargetWall() < 0 ?
                         ((int)$post->isPostedOnBehalfOfGroup()) : "false",
+                        "new_text"    => $post->getText(false),
                         "author"      => [
                             "name"    => $post->getOwner()->getCanonicalName(),
                             "avatar"  => $post->getOwner()->getAvatarUrl()
diff --git a/Web/Presenters/templates/Photos/UploadPhoto.xml b/Web/Presenters/templates/Photos/UploadPhoto.xml
index 6ea987cb..16b03262 100644
--- a/Web/Presenters/templates/Photos/UploadPhoto.xml
+++ b/Web/Presenters/templates/Photos/UploadPhoto.xml
@@ -23,7 +23,7 @@
 
     <input type="file" accept=".jpg,.png,.gif" name="files[]" multiple class="button" id="uploadButton" style="display:none">
 
-    <div class="container_gray" style="height: 344px;">
+    <div class="container_gray" style="min-height: 344px;">
         <div class="insertThere"></div>
         <div class="whiteBox" style="display: block;">
             <div class="boxContent">
diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml
index fb8fb244..69238417 100644
--- a/Web/Presenters/templates/components/comment.xml
+++ b/Web/Presenters/templates/components/comment.xml
@@ -8,19 +8,19 @@
         <tr>
             <td width="30" valign="top">
                 <a href="{$author->getURL()}">
-                    <img src="{$author->getAvatarURL('miniscule')}" width="30" class="cCompactAvatars" />
+                    <img src="{$author->getAvatarURL('miniscule')}" width="30" class="cCompactAvatars post-avatar" />
                 </a>
             </td>
             <td width="100%" valign="top">
                 <div class="post-author">
-                    <a href="{$author->getURL()}"><b>
+                    <a href="{$author->getURL()}"><b class="post-author-name">
                         {$author->getCanonicalName()}
                     </b></a>
                     <img n:if="$author->isVerified()" class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png"><br/>
                 </div>
                 <div class="post-content" id="{$comment->getId()}">
                     <div class="text" id="text{$comment->getId()}">
-                        <span class="really_text">{$comment->getText()|noescape}</span>
+                        <span data-text="{$comment->getText(false)}" class="really_text">{$comment->getText()|noescape}</span>
                         
                         <div n:ifcontent class="attachments_b">
                             <div class="attachment" n:foreach="$comment->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index c8cd2a12..6b0444c7 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -72,7 +72,7 @@
                 </div>
                 <div class="post-content" id="{$post->getPrettyId()}">
                     <div class="text">
-                        <span class="really_text">{$post->getText()|noescape}</span>
+                        <span data-text="{$post->getText(false)}" class="really_text">{$post->getText()|noescape}</span>
 
                         <div n:ifcontent class="attachments_b">
                             <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml
index ad7896f2..6e0b4c53 100644
--- a/Web/Presenters/templates/components/post/oldpost.xml
+++ b/Web/Presenters/templates/components/post/oldpost.xml
@@ -63,7 +63,7 @@
                     <div class="text">
                         {var $owner = $author->getId()}
 
-                        <span class="really_text">{$post->getText()|noescape}</span>
+                        <span data-text="{$post->getText(false)}" class="really_text">{$post->getText()|noescape}</span>
 
                         <div n:ifcontent class="attachments_b">
                             <div class="attachment" n:foreach="$post->getChildren() as $attachment" data-localized-nsfw-text="{_nsfw_warning}">
diff --git a/Web/static/js/al_photos.js b/Web/static/js/al_photos.js
index 59965c09..41bf729b 100644
--- a/Web/static/js/al_photos.js
+++ b/Web/static/js/al_photos.js
@@ -142,23 +142,23 @@ $(document).on("dragover drop", (e) => {
     return false;
 })
 
-$(document).on("dragover", (e) => {
+$(".container_gray").on("dragover", (e) => {
     e.preventDefault()
     document.querySelector("#fakeButton").classList.add("dragged")
     document.querySelector("#fakeButton").value = tr("drag_files_here")
 })
 
-$(document).on("dragleave", (e) => {
+$(".container_gray").on("dragleave", (e) => {
     e.preventDefault()
     document.querySelector("#fakeButton").classList.remove("dragged")
     document.querySelector("#fakeButton").value = tr("upload_picts")
 })
 
-$("#fakeButton").on("drop", (e) => {
+$(".container_gray").on("drop", (e) => {
     e.originalEvent.dataTransfer.dropEffect = 'move';
     e.preventDefault()
 
-    $(document).trigger("dragleave")
+    $(".container_gray").trigger("dragleave")
 
     let files = e.originalEvent.dataTransfer.files
 
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 9b54adce..4c8bb933 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -273,7 +273,7 @@ $(document).on("click", "#editPost", (e) => {
         content.insertAdjacentHTML("afterbegin", `
             <div class="editMenu">
                 <div id="wall-post-input999"> 
-                    <textarea id="new_content">${text.innerHTML.replace(/(<([^>]+)>)/gi, '')}</textarea>
+                    <textarea id="new_content">${text.dataset.text}</textarea>
                     <input type="button" class="button" value="${tr("save")}" id="endEditing">
                     <input type="button" class="button" value="${tr("cancel")}" id="cancelEditing">
                 </div>
@@ -343,6 +343,7 @@ $(document).on("click", "#editPost", (e) => {
 
                     post.querySelector(".post-avatar").setAttribute("src", result.author.avatar)
                     post.querySelector(".post-author-name").innerHTML = result.author.name
+                    post.querySelector(".really_text").setAttribute("data-text", result.new_text)
                 } else {
                     MessageBox(tr("error"), result.error, [tr("ok")], [Function.noop])
                     post.querySelector("#editPost").click()