diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index 56f460852f2..dc3c1cdf971 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -29,8 +29,8 @@ function emojiOptions() {
   return { getURL: Discourse.getURLWithCDN, emojiSet: siteSettings.emoji_set };
 }
 
-export function emojiUnescape(string) {
-  const opts = emojiOptions();
+export function emojiUnescape(string, options) {
+  const opts = _.extend(emojiOptions(), options || {});
   return opts ? performEmojiUnescape(string, opts) : string;
 }
 
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6
index 67f047dc01d..3df9040a240 100644
--- a/app/assets/javascripts/pretty-text/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6
@@ -38,7 +38,7 @@ export function performEmojiUnescape(string, opts) {
       const classes = isCustomEmoji(emojiVal, opts) ? "emoji emoji-custom" : "emoji";
 
       return url && (isEmoticon || hasEndingColon) ?
-             `<img src='${url}' title='${emojiVal}' alt='${emojiVal}' class='${classes}'>` : m;
+             `<img src='${url}' ${opts.skipTitle ? '' : `title='${emojiVal}'`} alt='${emojiVal}' class='${classes}'>` : m;
     });
   }