diff --git a/app/containers/Message.js b/app/containers/message/index.js
similarity index 95%
rename from app/containers/Message.js
rename to app/containers/message/index.js
index f9a8d8349..2aa937d82 100644
--- a/app/containers/Message.js
+++ b/app/containers/message/index.js
@@ -5,9 +5,9 @@ import { emojify } from 'react-emojione';
 import Markdown from 'react-native-easy-markdown';
 import ActionSheet from 'react-native-actionsheet';
 
-import Card from './message/Card';
-import Avatar from './Avatar';
-import User from './message/User';
+import Card from './Card';
+import User from './User';
+import Avatar from '../Avatar';
 
 const title = 'Message actions';
 const options = ['Cancel', 'Reply', 'Edit', 'Permalink', 'Copy', 'Quote', 'Star Message', 'Delete'];
diff --git a/app/views/RoomView.js b/app/views/RoomView.js
index f50db0e9b..1c68d2ab0 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, InteractionManager, SafeAreaView } from 'react-native';
+import { Text, View, StyleSheet, Button, SafeAreaView } from 'react-native';
 import { ListView } from 'realm/react-native';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -9,7 +9,7 @@ import * as actions from '../actions';
 import { messagesRequest } from '../actions/messages';
 import realm from '../lib/realm';
 import RocketChat from '../lib/rocketchat';
-import Message from '../containers/Message';
+import Message from '../containers/message';
 import MessageBox from '../containers/MessageBox';
 import KeyboardView from '../presentation/KeyboardView';