diff --git a/css/organisms/RoomView.css b/css/organisms/RoomView.css
index d9345f75ec..a7704b959c 100644
--- a/css/organisms/RoomView.css
+++ b/css/organisms/RoomView.css
@@ -2,10 +2,17 @@
     display: table-cell;
     padding-left: 5px;
     word-wrap: break-word;
+    position: relative;
+    padding-bottom: 70px
 }
 
 .mx_RoomView ul {
     padding: 0px;
+    margin: 0px;
     height: 100%;
     overflow-y: scroll;
 }
+
+.mx_RoomView li {
+    list-style-type: none;
+}
diff --git a/src/organisms/RoomView.js b/src/organisms/RoomView.js
index bc23fc0132..b587b5cafe 100644
--- a/src/organisms/RoomView.js
+++ b/src/organisms/RoomView.js
@@ -1,6 +1,7 @@
 var React = require('react');
 var MessageTile = require('../molecules/MessageTile');
 var RoomHeader = require('../molecules/RoomHeader');
+var MessageComposer = require('../molecules/MessageComposer');
 
 var MatrixClientPeg = require("../MatrixClientPeg");
 
@@ -35,7 +36,7 @@ module.exports = React.createClass({
     getMessageTiles: function() {
         return this.state.room.timeline.map(function(mxEv) {
             return (
-                <MessageTile mxEvent={mxEv} key={mxEv.getId()} />
+                <li><MessageTile mxEvent={mxEv} key={mxEv.getId()} /></li>
             );
         });
     },
@@ -47,6 +48,7 @@ module.exports = React.createClass({
                 <ul>
                     {this.getMessageTiles()}
                 </ul>
+                <MessageComposer room={this.state.room} />
             </div>
         );
     },