Merge pull request #16 from matrix-org/markjh/end-to-end

Add basic support for end-to-end crypto using olm.

skins/base/views/molecules/UnknownMessageTile.js

@@ -25,9 +25,10 @@ module.exports = React.createClass({
     mixins: [UnknownMessageTileController],
 
     render: function() {
+        var content = this.props.mxEvent.getContent();
         return (
             <span className="mx_UnknownMessageTile">
-                ?
+                {content.body}
             </span>
         );
     },