diff --git a/app/javascript/flavours/glitch/features/emoji/emoji.js b/app/javascript/flavours/glitch/features/emoji/emoji.js
index 880f9401da..6138164e05 100644
--- a/app/javascript/flavours/glitch/features/emoji/emoji.js
+++ b/app/javascript/flavours/glitch/features/emoji/emoji.js
@@ -19,13 +19,10 @@ const emojiFilename = (filename) => {
   return borderedEmoji.includes(filename) ? (filename + '_border') : filename;
 };
 
-const domParser = new DOMParser();
-
 const emojifyTextNode = (node, customEmojis) => {
+  const parentElement = node.parentElement;
   let str = node.textContent;
 
-  const fragment = new DocumentFragment();
-
   for (;;) {
     let match, i = 0;
 
@@ -67,16 +64,12 @@ const emojifyTextNode = (node, customEmojis) => {
       }
     }
 
-    fragment.append(document.createTextNode(str.slice(0, i)));
-    if (replacement) {
-      fragment.append(domParser.parseFromString(replacement, 'text/html').documentElement.getElementsByTagName('img')[0]);
-    }
     node.textContent = str.slice(0, i);
+    parentElement.insertAdjacentHTML('beforeend', replacement);
     str = str.slice(rend);
+    node = document.createTextNode(str);
+    parentElement.append(node);
   }
-
-  fragment.append(document.createTextNode(str));
-  node.parentElement.replaceChild(fragment, node);
 };
 
 const emojifyNode = (node, customEmojis) => {
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index d5809a0ca4..8e3727d777 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.0.1'
+      '+1.0.0'
     end
 
     def to_a