diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js
index 01ad52a0..da91f2b1 100644
--- a/app/js/lib/ng_utils.js
+++ b/app/js/lib/ng_utils.js
@@ -1743,8 +1743,8 @@ angular.module('izhukov.utils', [])
       if (!options.nested && (emojiFound || options.hasNested)) {
         text = text.replace(/\ufe0f|️|�|‍/g, '', text)
         var emojiSizeClass = curEmojiSize == 18 ? '' : (' emoji-w' + curEmojiSize)
-        text = text.replace(/<span class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g,
-          '<span class="emoji ' + emojiSizeClass + ' emoji-spritesheet-$1" style="background-position: -$2px -$3px;" $4</span>')
+        text = text.replace(/<span((?: [^>]*)?) class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g,
+          '<span$1 class="emoji ' + emojiSizeClass + ' emoji-spritesheet-$2" style="background-position: -$3px -$4px;" $5</span>')
       }
 
       return $sce.trustAs('html', text)