From 88aaf82c8870f046ecc6a709bf3ff4de5dfa367e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 16 Sep 2015 16:23:35 +0100
Subject: [PATCH] Backport: linkify emotes

---
 src/controllers/molecules/MEmoteTile.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/controllers/molecules/MEmoteTile.js b/src/controllers/molecules/MEmoteTile.js
index 8aa688b21e..1fb117ceef 100644
--- a/src/controllers/molecules/MEmoteTile.js
+++ b/src/controllers/molecules/MEmoteTile.js
@@ -16,6 +16,15 @@ limitations under the License.
 
 'use strict';
 
+var linkify = require('linkifyjs');
+var linkifyElement = require('linkifyjs/element');
+var linkifyMatrix = require('../../linkify-matrix');
+
+linkifyMatrix(linkify);
+
 module.exports = {
+    componentDidMount: function() {
+        linkifyElement(this.refs.content.getDOMNode(), linkifyMatrix.options);
+    }
 };