diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js
index d8b9e01c8f3113c929e45a882a4075957915dd32..d5f9e693f34cf83f074a33641524ec009ffa8702 100644
--- a/app/containers/MessageBox/index.js
+++ b/app/containers/MessageBox/index.js
@@ -42,7 +42,6 @@ import {
 	MENTIONS_TRACKING_TYPE_USERS
 } from './constants';
 import CommandsPreview from './CommandsPreview';
-import { withTheme } from '../../theme';
 
 const imagePickerConfig = {
 	cropping: true,
@@ -888,4 +887,4 @@ const dispatchToProps = ({
 	typing: (rid, status) => userTypingAction(rid, status)
 });
 
-export default connect(mapStateToProps, dispatchToProps, null, { forwardRef: true })(withTheme(MessageBox));
+export default connect(mapStateToProps, dispatchToProps, null, { forwardRef: true })(MessageBox);
diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js
index 79b016588a25b337417062587168448e45764fd2..4d55a21f285d0bbf7d6e36a49d20d5f6e9d3857c 100644
--- a/app/views/RoomView/index.js
+++ b/app/views/RoomView/index.js
@@ -813,6 +813,7 @@ class RoomView extends React.Component {
 				tmid={this.tmid}
 				roomType={room.t}
 				isFocused={navigation.isFocused}
+				theme={theme}
 				message={selectedMessage}
 				editing={editing}
 				editRequest={this.onEditRequest}