diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 442bbed6..6c1c6bba 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -158,7 +158,7 @@ const RocketChat = {
 		});
 	},
 
-	loginWithPassword({username, password, code}, callback) {
+	loginWithPassword({ username, password, code }, callback) {
 		let params = {};
 		const state = reduxStore.getState();
 
diff --git a/app/views/login.js b/app/views/login.js
index 89ebb85f..413bf3d8 100644
--- a/app/views/login.js
+++ b/app/views/login.js
@@ -80,7 +80,7 @@ export default class LoginView extends React.Component {
 			username: this.state.username,
 			password: this.state.password,
 			code: this.state.code
-		}
+		};
 
 		RocketChat.loginWithPassword(credentials, (error) => {
 			if (error) {
diff --git a/app/views/room.js b/app/views/room.js
index 60d5b349..e696d9f2 100644
--- a/app/views/room.js
+++ b/app/views/room.js
@@ -11,7 +11,8 @@ import RocketChat from '../lib/rocketchat';
 import debounce from '../utils/throttle';
 import Message from '../components/Message';
 import MessageBox from '../components/MessageBox';
-// import KeyboardView from '../components/KeyboardView';
+import KeyboardView from '../components/KeyboardView';
+
 const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 });
 const styles = StyleSheet.create({
 	container: {
@@ -198,7 +199,7 @@ export default class RoomView extends React.Component {
 		// keyExtractor={item => item._id}
 		//
 		return (
-			<View style={styles.container}>
+			<KeyboardView style={styles.container} keyboardVerticalOffset={64}>
 				{this.renderBanner()}
 				<ListView
 					enableEmptySections
@@ -210,7 +211,7 @@ export default class RoomView extends React.Component {
 					renderRow={item => this.renderItem({ item })}
 				/>
 				{this.renderFooter()}
-			</View>
+			</KeyboardView>
 		);
 	}
 }
diff --git a/app/views/serverNew.js b/app/views/serverNew.js
index 6f0978d8..95cd9d45 100644
--- a/app/views/serverNew.js
+++ b/app/views/serverNew.js
@@ -174,7 +174,6 @@ export default class NewServerView extends React.Component {
 					});
 					reject(url);
 				});
-
 		} else {
 			this.setState({
 				validInstance: undefined