diff --git a/package.json b/package.json
index e5143b0b69..ea7d2bf9c6 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "matrix-js-sdk": "0.1.1",
     "q": "^1.4.1",
     "react": "^0.13.0",
-    "react-loader": "^1.4.0"
+    "react-loader": "^1.4.0",
+    "linkifyjs": "^2.0.0-beta.4"
   },
   "devDependencies": {
     "catw": "^1.0.1",
diff --git a/skins/base/views/molecules/MNoticeTile.js b/skins/base/views/molecules/MNoticeTile.js
index 1ea72a8d81..337b99fd12 100644
--- a/skins/base/views/molecules/MNoticeTile.js
+++ b/skins/base/views/molecules/MNoticeTile.js
@@ -27,7 +27,7 @@ module.exports = React.createClass({
     render: function() {
         var content = this.props.mxEvent.getContent();
         return (
-            <span className="mx_MNoticeTile mx_messageTileType">
+            <span ref="content" className="mx_MNoticeTile mx_messageTileType">
                 {content.body}
             </span>
         );
diff --git a/skins/base/views/molecules/MTextTile.js b/skins/base/views/molecules/MTextTile.js
index 8b36f7bb3b..eb8f2a737e 100644
--- a/skins/base/views/molecules/MTextTile.js
+++ b/skins/base/views/molecules/MTextTile.js
@@ -27,7 +27,7 @@ module.exports = React.createClass({
     render: function() {
         var content = this.props.mxEvent.getContent();
         return (
-            <span className="mx_MTextTile mx_messageTileType">
+            <span ref="content" className="mx_MTextTile mx_messageTileType">
                 {content.body}
             </span>
         );
diff --git a/src/controllers/molecules/MNoticeTile.js b/src/controllers/molecules/MNoticeTile.js
index d0977e0043..99bd511a54 100644
--- a/src/controllers/molecules/MNoticeTile.js
+++ b/src/controllers/molecules/MNoticeTile.js
@@ -16,5 +16,10 @@ limitations under the License.
 
 'use strict';
 
+var linkifyElement = require('linkifyjs/element');
+
 module.exports = {
+    componentDidMount: function() {
+        linkifyElement(this.refs.content.getDOMNode());
+    }
 };
diff --git a/src/controllers/molecules/MTextTile.js b/src/controllers/molecules/MTextTile.js
index 8aa688b21e..3ecc2c8286 100644
--- a/src/controllers/molecules/MTextTile.js
+++ b/src/controllers/molecules/MTextTile.js
@@ -16,6 +16,11 @@ limitations under the License.
 
 'use strict';
 
+var linkifyElement = require('linkifyjs/element');
+
 module.exports = {
+    componentDidMount: function() {
+        linkifyElement(this.refs.content.getDOMNode());
+    }
 };