diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 3b72525fbd..36fc87b7cd 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -609,6 +609,27 @@ module.exports = withMatrixClient(React.createClass({
                     </div>
                 );
             }
+            case 'reply_preview': {
+                return (
+                    <div className={classes}>
+                        { avatar }
+                        { sender }
+                        <div className="mx_EventTile_line mx_EventTile_reply">
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                                { timestamp }
+                            </a>
+                            { this._renderE2EPadlock() }
+                            { Reply.getQuote(this.props.mxEvent, this.props.onWidgetLoad) }
+                            <EventTileType ref="tile"
+                                           mxEvent={this.props.mxEvent}
+                                           highlights={this.props.highlights}
+                                           highlightLink={this.props.highlightLink}
+                                           onWidgetLoad={this.props.onWidgetLoad}
+                                           showUrlPreview={false} />
+                        </div>
+                    </div>
+                );
+            }
             default: {
                 return (
                     <div className={classes}>
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index 045c3da9b3..0404511c9f 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -71,7 +71,7 @@ export default class ReplyPreview extends React.Component {
                          onClick={cancelQuoting} />
                 </div>
                 <div className="mx_ReplyPreview_clear" />
-                <EventTile mxEvent={this.state.event} last={true} tileShape="reply" onWidgetLoad={dummyOnWidgetLoad} />
+                <EventTile mxEvent={this.state.event} last={true} tileShape="reply_preview" onWidgetLoad={dummyOnWidgetLoad} />
             </div>
         </div>;
     }