diff --git a/app/containers/Banner.js b/app/containers/Banner.js
index f6af6a821..a49a6aa04 100644
--- a/app/containers/Banner.js
+++ b/app/containers/Banner.js
@@ -30,9 +30,29 @@ export default class Banner extends React.PureComponent {
 		authenticating: PropTypes.bool,
 		offline: PropTypes.bool
 	}
-
+	componentWillMount() {
+		this.state = {
+			slow: false
+		};
+		this.timer = setTimeout(() => this.setState({ slow: true }), 5000);
+	}
+	componentWillUnmount() {
+		clearTimeout(this.timer);
+	}
 	render() {
 		const { connecting, authenticating, offline } = this.props;
+
+		if (!this.state.slow) {
+			return null;
+		}
+
+		if (offline) {
+			return (
+				<View style={[styles.bannerContainer, { backgroundColor: 'red' }]}>
+					<Text style={[styles.bannerText, { color: '#a00' }]}>offline...</Text>
+				</View>
+			);
+		}
 		if (connecting) {
 			return (
 				<View style={[styles.bannerContainer, { backgroundColor: '#0d0' }]}>
@@ -49,13 +69,6 @@ export default class Banner extends React.PureComponent {
 			);
 		}
 
-		if (offline) {
-			return (
-				<View style={[styles.bannerContainer, { backgroundColor: 'red' }]}>
-					<Text style={[styles.bannerText, { color: '#a00' }]}>offline...</Text>
-				</View>
-			);
-		}
 		return null;
 	}
 }
diff --git a/app/containers/Message.js b/app/containers/Message.js
index 418521ac8..da39c5f2d 100644
--- a/app/containers/Message.js
+++ b/app/containers/Message.js
@@ -10,7 +10,8 @@ import User from './message/User';
 
 const styles = StyleSheet.create({
 	content: {
-		flexGrow: 1
+		flexGrow: 1,
+		flexShrink: 1
 	},
 	message: {
 		padding: 12,
diff --git a/app/sagas/messages.js b/app/sagas/messages.js
index 94d4ad4d8..e21b28ce9 100644
--- a/app/sagas/messages.js
+++ b/app/sagas/messages.js
@@ -5,7 +5,6 @@ import RocketChat from '../lib/rocketchat';
 
 const get = function* get({ rid }) {
 	const auth = yield select(state => state.login.isAuthenticated);
-	console.log('hey now', yield select(state => state.login));
 	if (!auth) {
 		yield take(LOGIN.SUCCESS);
 	}
diff --git a/app/views/RoomView.js b/app/views/RoomView.js
index 6aee14bbb..b57690721 100644
--- a/app/views/RoomView.js
+++ b/app/views/RoomView.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Text, View, StyleSheet, Button } from 'react-native';
+import { Text, View, StyleSheet, Button, InteractionManager } from 'react-native';
 import { ListView } from 'realm/react-native';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -9,12 +9,11 @@ import * as actions from '../actions';
 import { messagesRequest } from '../actions/messages';
 import realm from '../lib/realm';
 import RocketChat from '../lib/rocketchat';
-import debounce from '../utils/throttle';
 import Message from '../containers/Message';
 import MessageBox from '../containers/MessageBox';
 import KeyboardView from '../presentation/KeyboardView';
 
-const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 });
+const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1._id !== r2._id });
 const styles = StyleSheet.create({
 	container: {
 		flex: 1,
@@ -72,10 +71,10 @@ export default class RoomView extends React.Component {
 
 		this.sid = props.navigation.state.params.room.sid;
 		this.rid = props.rid || realm.objectForPrimaryKey('subscriptions', this.sid).rid;
-		// this.rid = 'GENERAL';
 
 		this.data = realm.objects('messages').filtered('_server.id = $0 AND rid = $1', this.props.server, this.rid).sorted('ts', true);
 		this.state = {
+			slow: false,
 			dataSource: [],
 			loaded: true,
 			joined: typeof props.rid === 'undefined'
@@ -86,31 +85,20 @@ export default class RoomView extends React.Component {
 		this.props.navigation.setParams({
 			title: this.props.name || realm.objectForPrimaryKey('subscriptions', this.sid).name
 		});
-
+		this.timer = setTimeout(() => this.setState({ slow: true }), 5000);
 		this.props.getMessages(this.rid);
-		// const late = setTimeout(() => this.setState({
-		// 	loaded: false
-		// }), 1000);
-		// RocketChat.loadMessagesForRoom(this.rid, null, () => {
-		// 	clearTimeout(late);
-		// 	this.setState({
-		// 		loaded: true
-		// 	});
-		realm.addListener('change', this.updateState);
-		// });
-		// this.updateState();
-		this.state = {
-			...this.state,
-			dataSource: ds.cloneWithRows(this.getData())
-		};
+		this.data.addListener(this.updateState);
+		this.state.dataSource = ds.cloneWithRows(this.data);
 	}
-
 	componentDidMount() {
-		return RocketChat.readMessages(this.rid);
+		InteractionManager.runAfterInteractions(() => RocketChat.readMessages(this.rid));
+	}
+	componentDidUpdate() {
+		return !this.props.loading && clearTimeout(this.timer);
 	}
-
 	componentWillUnmount() {
-		realm.removeListener('change', this.updateState);
+		clearTimeout(this.timer);
+		this.data.removeAllListeners();
 	}
 
 	onEndReached = () => {
@@ -132,35 +120,22 @@ export default class RoomView extends React.Component {
 		}
 	}
 
-	getData() {
-		return realm
-			.objects('messages')
-			.filtered('_server.id = $0 AND rid = $1', this.props.server, this.rid)
-			.sorted('ts', true);
-	}
-
-	updateState = debounce(() => {
+	updateState = () => {
 		this.setState({
-			dataSource: ds.cloneWithRows(this.getData())
+			dataSource: ds.cloneWithRows(this.data)
 		});
-		// RocketChat.readMessages(this.rid);
-		// this.setState({
-		// 	messages: this.messages
-		// });
-	}, 100);
+	};
 
 	sendMessage = message => RocketChat.sendMessage(this.rid, message);
 
-	joinRoom = () => {
-		RocketChat.joinRoom(this.props.rid)
-			.then(() => {
-				this.setState({
-					joined: true
-				});
-			});
+	joinRoom = async() => {
+		await RocketChat.joinRoom(this.props.rid);
+		this.setState({
+			joined: true
+		});
 	};
 
-	renderBanner = () => (this.props.loading ?
+	renderBanner = () => (this.state.slow && this.props.loading ?
 		(
 			<View style={styles.bannerContainer}>
 				<Text style={styles.bannerText}>Loading new messages...</Text>
diff --git a/app/views/RoomsListView.js b/app/views/RoomsListView.js
index d1929497c..08b927c45 100644
--- a/app/views/RoomsListView.js
+++ b/app/views/RoomsListView.js
@@ -23,7 +23,8 @@ const styles = StyleSheet.create({
 		backgroundColor: '#E7E7E7'
 	},
 	list: {
-		width: '100%'
+		width: '100%',
+		backgroundColor: '#FFFFFF'
 	},
 	emptyView: {
 		flexGrow: 1,
@@ -81,19 +82,20 @@ export default class RoomsListView extends React.Component {
 			searchText: '',
 			login: false
 		};
+		this.data = realm.objects('subscriptions').filtered('_server.id = $0', this.props.server).sorted('_updatedAt', true);
 	}
 
 	componentWillMount() {
-		realm.addListener('change', this.updateState);
+		this.data.addListener(this.updateState);
 
 		this.state = {
 			...this.state,
-			dataSource: ds.cloneWithRows(this.getData())
+			dataSource: ds.cloneWithRows(this.data)
 		};
 	}
 
 	componentWillUnmount() {
-		realm.removeListener('change', this.updateState);
+		this.data.removeAllListeners();
 	}
 
 	onSearchChangeText = (text) => {
@@ -154,13 +156,9 @@ export default class RoomsListView extends React.Component {
 		});
 	}
 
-	getData() {
-		return realm.objects('subscriptions').filtered('_server.id = $0', this.props.server);
-	}
-
 	updateState = () => {
 		this.setState({
-			dataSource: ds.cloneWithRows(this.getData())
+			dataSource: ds.cloneWithRows(this.data)
 		});
 	};
 
@@ -229,8 +227,8 @@ export default class RoomsListView extends React.Component {
 
 	renderItem = item => (
 		<RoomItem
+			{...item}
 			key={item._id}
-			name={item.name}
 			type={item.t}
 			baseUrl={this.props.Site_Url}
 			onPress={() => this._onPressItem(item._id, item)}