diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 36fc87b7cd..5ccba1cf0f 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -589,37 +589,22 @@ module.exports = withMatrixClient(React.createClass({
                     </div>
                 );
             }
-            case 'reply': {
-                return (
-                    <div className={classes}>
-                        { avatar }
-                        { sender }
-                        <div className="mx_EventTile_line mx_EventTile_reply">
-                            <a href={permalink} onClick={this.onPermalinkClicked}>
-                                { timestamp }
-                            </a>
-                            { this._renderE2EPadlock() }
-                            <EventTileType ref="tile"
-                                           mxEvent={this.props.mxEvent}
-                                           highlights={this.props.highlights}
-                                           highlightLink={this.props.highlightLink}
-                                           onWidgetLoad={this.props.onWidgetLoad}
-                                           showUrlPreview={false} />
-                        </div>
-                    </div>
-                );
-            }
+
+            case 'reply':
             case 'reply_preview': {
                 return (
                     <div className={classes}>
                         { avatar }
                         { sender }
-                        <div className="mx_EventTile_line mx_EventTile_reply">
+                        <div className="mx_EventTile_reply">
                             <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>
                             { this._renderE2EPadlock() }
-                            { Reply.getQuote(this.props.mxEvent, this.props.onWidgetLoad) }
+                            {
+                                this.props.tileShape === 'reply_preview'
+                                && Reply.getQuote(this.props.mxEvent, this.props.onWidgetLoad)
+                            }
                             <EventTileType ref="tile"
                                            mxEvent={this.props.mxEvent}
                                            highlights={this.props.highlights}