diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 869dffcf9b..ae9522e511 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -45,7 +45,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
 import SettingsStore from "../../settings/SettingsStore";
-import Reply from "../views/elements/Reply";
+import Reply from "../views/elements/ReplyThread";
 
 const DEBUG = false;
 let debuglog = function() {};
diff --git a/src/components/views/elements/Reply.js b/src/components/views/elements/ReplyThread.js
similarity index 96%
rename from src/components/views/elements/Reply.js
rename to src/components/views/elements/ReplyThread.js
index 5b213690cc..24ab6163fb 100644
--- a/src/components/views/elements/Reply.js
+++ b/src/components/views/elements/ReplyThread.js
@@ -159,7 +159,7 @@ export default class Reply extends React.Component {
         let header = null;
 
         if (this.state.err) {
-            header = <blockquote className="mx_Reply mx_Reply_error">
+            header = <blockquote className="mx_ReplyThread mx_ReplyThread_error">
                 {
                     _t('Unable to load event that was replied to, ' +
                         'it either does not exist or you do not have permission to view it.')
@@ -169,10 +169,10 @@ export default class Reply extends React.Component {
             const ev = this.state.loadedEv;
             const Pill = sdk.getComponent('elements.Pill');
             const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
-            header = <blockquote className="mx_Reply">
+            header = <blockquote className="mx_ReplyThread">
                 {
                     _t('<a>In reply to</a> <pill>', {}, {
-                        'a': (sub) => <a onClick={this.onQuoteClick} className="mx_Reply_show">{ sub }</a>,
+                        'a': (sub) => <a onClick={this.onQuoteClick} className="mx_ReplyThread_show">{ sub }</a>,
                         'pill': <Pill type={Pill.TYPE_USER_MENTION} room={room}
                                       url={makeUserPermalink(ev.getSender())} shouldShowPillAvatar={true} />,
                     })
@@ -192,7 +192,7 @@ export default class Reply extends React.Component {
                 dateSep = <a href={this.props.url}><DateSeparator ts={ev.getTs()} /></a>;
             }
 
-            return <blockquote className="mx_Reply" key={ev.getId()}>
+            return <blockquote className="mx_ReplyThread" key={ev.getId()}>
                 { dateSep }
                 <EventTile mxEvent={ev}
                            tileShape="reply"
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 5ccba1cf0f..1e3bb4599f 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -18,7 +18,7 @@ limitations under the License.
 'use strict';
 
 
-import Reply from "../elements/Reply";
+import Reply from "../elements/ReplyThread";
 
 const React = require('react');
 import PropTypes from 'prop-types';
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1de53b4cfc..e8725bdf05 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -54,7 +54,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import {makeUserPermalink} from "../../../matrix-to";
 import ReplyPreview from "./ReplyPreview";
 import RoomViewStore from '../../../stores/RoomViewStore';
-import Reply from "../elements/Reply";
+import Reply from "../elements/ReplyThread";
 import {ContentHelpers} from 'matrix-js-sdk';
 
 const EMOJI_SHORTNAMES = Object.keys(emojioneList);