diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 04a3a83fd7..7540d40dc2 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -157,18 +157,24 @@ module.exports = React.createClass({
         // TODO: make this configurable?
         if (node.textContent.indexOf("/") > -1)
         {
-            return node;
+            return true;
         }
         else {
             var url = node.getAttribute("href");
             var host = url.match(/^https?:\/\/(.*?)(\/|$)/)[1];
+
+            // never preview matrix.to links (if anything we should give a smart
+            // preview of the room/user they point to: nobody needs to be reminded
+            // what the matrix.to site looks like).
+            if (host == 'matrix.to') return false;
+
             if (node.textContent.toLowerCase().trim().startsWith(host.toLowerCase())) {
                 // it's a "foo.pl" style link
-                return;
+                return false;
             }
             else {
                 // it's a [foo bar](http://foo.com) style link
-                return node;
+                return true;
             }
         }
     },