Merge pull request #145 from matrix-org/rav/outdent_roomview_render

Drop a redundant 'else' from RoomView.render, and outdent a load of code

src/components/structures/RoomView.js

@@ -1554,7 +1554,11 @@ module.exports = React.createClass({
                     </div>
                 );
             }
-        } else {
+        }
+
+        // We have successfully loaded this room, and are not previewing.
+        // Display the "normal" room view.
+
         var scrollheader_classes = classNames({
             mx_RoomView_scrollheader: true,
             loading: this.state.paginating
@@ -1852,6 +1856,5 @@ module.exports = React.createClass({
                 { messageComposer }
             </div>
         );
-        }
     },
 });