diff --git a/app/containers/message/Video.js b/app/containers/message/Video.js
index 6eb3a8deb..582eaf74c 100644
--- a/app/containers/message/Video.js
+++ b/app/containers/message/Video.js
@@ -29,8 +29,6 @@ export default class Video extends React.PureComponent {
 			modalVisible: false,
 			uri: `${ server }${ file.video_url }?rc_uid=${ user.id }&rc_token=${ user.token }`
 		};
-		// this.setState({ img: `${ this.props.base }${ this.props.data.image_url }?rc_uid=${ user._id }&rc_token=${ token }` });
-		console.warn(this.state.uri)
 	}
 
 	toggleModal() {
diff --git a/app/containers/message/VideoModal.js b/app/containers/message/VideoModal.js
index 54c6fd16b..6ebb99543 100644
--- a/app/containers/message/VideoModal.js
+++ b/app/containers/message/VideoModal.js
@@ -1,13 +1,7 @@
 import React from 'react';
-import { Text } from 'react-native';
 import PropTypes from 'prop-types';
 import Modal from 'react-native-modal';
 import VideoPlayer from 'react-native-video-controls';
-import Video from 'react-native-video';
-import RocketChat from '../../lib/rocketchat';
-
-import { connect } from 'react-redux';
-import { setToken } from '../../actions/login';
 
 
 const styles = {
@@ -16,21 +10,8 @@ const styles = {
 		alignItems: 'center',
 		justifyContent: 'center',
 		backgroundColor: '#000'
-	}, backgroundVideo: {
-		position: 'absolute',
-		top: 0,
-		left: 0,
-		bottom: 0,
-		right: 0,
-	  },
+	}
 };
-
-@connect(state => ({
-	server: state.server.server,
-	user: state.login.user
-}), dispatch => ({
-	setToken: token => dispatch(setToken(token))
-}))
 export default class extends React.PureComponent {
 	static propTypes = {
 		uri: PropTypes.string.isRequired,
@@ -38,32 +19,12 @@ export default class extends React.PureComponent {
 		onClose: PropTypes.func.isRequired
 	}
 
-	constructor(props) {
-		super(props);
-		this.state = {
-			uri: '',
-			loading: true
-		};
-	}
-
-	async componentWillMount() {
-		const newUri = await RocketChat.resolveFile(this.props.uri);
-		console.warn(newUri);
-		this.setState({ uri: newUri, loading: false });
-		// this.props.setToken({token: newUri});
-	}
-
 	renderVideo() {
-		if (this.state.loading) {
-			return <Text style={{ color: '#fff' }}>Loading...</Text>;
-		}
-
 		return (
-			<Video
+			<VideoPlayer
 				source={{ uri: this.props.uri }}
-				style={styles.backgroundVideo}
-				// onBack={this.props.onClose}
-				// disableVolume
+				onBack={this.props.onClose}
+				disableVolume
 			/>
 		);
 	}
diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index aee9fd3fa..52c4e573a 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -26,16 +26,6 @@ const TOKEN_KEY = 'reactnativemeteor_usertoken';
 const RocketChat = {
 	TOKEN_KEY,
 
-	async resolveFile(url) {
-		const response = await fetch(url, {
-			method: 'GET',
-			mode: 'cors',
-			redirect: 'nofollow',
-			cache: 'default'
-		});
-		return response.url.toString();
-	},
-
 	createChannel({ name, users, type }) {
 		return call(type ? 'createChannel' : 'createPrivateGroup', name, users, type);
 	},
diff --git a/app/views/RoomView.js b/app/views/RoomView.js
index 872e8d22b..e4c4ad80a 100644
--- a/app/views/RoomView.js
+++ b/app/views/RoomView.js
@@ -216,7 +216,7 @@ export default class RoomView extends React.Component {
 					/>
 				</SafeAreaView>
 				{this.renderFooter()}
-				{/* <MessageActions room={this.room} /> */}
+				<MessageActions room={this.room} />
 			</KeyboardView>
 		);
 	}