diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index 71efae0c6a..12ed56f84b 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -55,6 +55,7 @@ interface IProps {
 }
 interface IState {
     thread?: Thread;
+    lastThreadReply?: MatrixEvent;
     layout: Layout;
     editState?: EditorStateTransfer;
     replyToEvent?: MatrixEvent;
@@ -142,14 +143,14 @@ export default class ThreadView extends React.Component<IProps, IState> {
         if (!thread) {
             thread = this.props.room.createThread([mxEv]);
         }
-        thread.on(ThreadEvent.Update, this.updateThread);
+        thread.on(ThreadEvent.Update, this.updateLastThreadReply);
         thread.once(ThreadEvent.Ready, this.updateThread);
         this.updateThread(thread);
     };
 
     private teardownThread = () => {
         if (this.state.thread) {
-            this.state.thread.removeListener(ThreadEvent.Update, this.updateThread);
+            this.state.thread.removeListener(ThreadEvent.Update, this.updateLastThreadReply);
             this.state.thread.removeListener(ThreadEvent.Ready, this.updateThread);
         }
     };
@@ -165,6 +166,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
         if (thread && this.state.thread !== thread) {
             this.setState({
                 thread,
+                lastThreadReply: thread.lastReply,
             }, () => {
                 thread.emit(ThreadEvent.ViewThread);
                 this.timelinePanelRef.current?.refreshTimeline();
@@ -172,6 +174,14 @@ export default class ThreadView extends React.Component<IProps, IState> {
         }
     };
 
+    private updateLastThreadReply = () => {
+        if (this.state.thread) {
+            this.setState({
+                lastThreadReply: this.state.thread.lastReply,
+            });
+        }
+    };
+
     private onScroll = (): void => {
         if (this.props.initialEvent && this.props.isInitialEventHighlighted) {
             dis.dispatch({
@@ -199,8 +209,11 @@ export default class ThreadView extends React.Component<IProps, IState> {
             : null;
 
         const threadRelation: IEventRelation = {
-            rel_type: RelationType.Thread,
-            event_id: this.state.thread?.id,
+            "rel_type": RelationType.Thread,
+            "event_id": this.state.thread?.id,
+            "m.in_reply_to": {
+                "event_id": this.state.lastThreadReply?.getId(),
+            },
         };
 
         const messagePanelClassNames = classNames(
diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx
index 00221f4585..680407dc0e 100644
--- a/src/components/views/elements/ReplyChain.tsx
+++ b/src/components/views/elements/ReplyChain.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import classNames from 'classnames';
-import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
+import { IEventRelation, MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import escapeHtml from "escape-html";
 import sanitizeHtml from "sanitize-html";
 import { Room } from 'matrix-js-sdk/src/models/room';
@@ -99,22 +99,8 @@ export default class ReplyChain extends React.Component<IProps, IState> {
 
     public static getParentEventId(ev: MatrixEvent): string | undefined {
         if (!ev || ev.isRedacted()) return;
-
-        // XXX: For newer relations (annotations, replacements, etc.), we now
-        // have a `getRelation` helper on the event, and you might assume it
-        // could be used here for replies as well... However, the helper
-        // currently assumes the relation has a `rel_type`, which older replies
-        // do not, so this block is left as-is for now.
-        //
-        // We're prefer ev.getContent() over ev.getWireContent() to make sure
-        // we grab the latest edit with potentially new relations. But we also
-        // can't just rely on ev.getContent() by itself because historically we
-        // still show the reply from the original message even though the edit
-        // event does not include the relation reply.
-        const mRelatesTo = ev.getContent()['m.relates_to'] || ev.getWireContent()['m.relates_to'];
-        if (mRelatesTo && mRelatesTo['m.in_reply_to']) {
-            const mInReplyTo = mRelatesTo['m.in_reply_to'];
-            if (mInReplyTo && mInReplyTo['event_id']) return mInReplyTo['event_id'];
+        if (ev.replyEventId) {
+            return ev.replyEventId;
         } else if (!SettingsStore.getValue("feature_thread") && ev.isThreadRelation) {
             return ev.threadRootId;
         }
@@ -232,7 +218,7 @@ export default class ReplyChain extends React.Component<IProps, IState> {
         return { body, html };
     }
 
-    public static makeReplyMixIn(ev: MatrixEvent) {
+    public static makeReplyMixIn(ev: MatrixEvent, renderIn?: string[]) {
         if (!ev) return {};
 
         const mixin: any = {
@@ -243,6 +229,10 @@ export default class ReplyChain extends React.Component<IProps, IState> {
             },
         };
 
+        if (renderIn) {
+            mixin['m.relates_to']['m.in_reply_to']['m.render_in'] = renderIn;
+        }
+
         /**
          * If the event replied is part of a thread
          * Add the `m.thread` relation so that clients
@@ -260,8 +250,21 @@ export default class ReplyChain extends React.Component<IProps, IState> {
         return mixin;
     }
 
-    public static hasReply(event: MatrixEvent) {
-        return Boolean(ReplyChain.getParentEventId(event));
+    public static shouldDisplayReply(event: MatrixEvent, renderTarget?: string): boolean {
+        const parentExist = Boolean(ReplyChain.getParentEventId(event));
+
+        const relations = event.getRelation();
+        const renderIn = relations?.["m.in_reply_to"]?.["m.render_in"] ?? [];
+
+        const shouldRenderInTarget = !renderTarget || (renderIn.includes(renderTarget));
+
+        return parentExist && shouldRenderInTarget;
+    }
+
+    public static getRenderInMixin(relation?: IEventRelation): string[] | undefined {
+        if (relation?.rel_type === RelationType.Thread) {
+            return [RelationType.Thread];
+        }
     }
 
     componentDidMount() {
diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx
index 6213e3b050..7387e0cc7b 100644
--- a/src/components/views/messages/MessageActionBar.tsx
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -382,7 +382,7 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
                 toolbarOpts.push(cancelSendingButton);
             }
 
-            if (this.props.isQuoteExpanded !== undefined && ReplyChain.hasReply(this.props.mxEvent)) {
+            if (this.props.isQuoteExpanded !== undefined && ReplyChain.shouldDisplayReply(this.props.mxEvent)) {
                 const expandClassName = classNames({
                     'mx_MessageActionBar_maskButton': true,
                     'mx_MessageActionBar_expandMessageButton': !this.props.isQuoteExpanded,
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 7af5a4b2f0..ff1aee9650 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -17,7 +17,7 @@ limitations under the License.
 
 import React, { createRef } from 'react';
 import classNames from "classnames";
-import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import { EventType, MsgType, RelationType } from "matrix-js-sdk/src/@types/event";
 import { EventStatus, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
@@ -1330,7 +1330,12 @@ export default class EventTile extends React.Component<IProps, IState> {
             msgOption = readAvatars;
         }
 
-        const replyChain = haveTileForEvent(this.props.mxEvent) && ReplyChain.hasReply(this.props.mxEvent)
+        const renderTarget = this.props.tileShape === TileShape.Thread
+            ? RelationType.Thread
+            : undefined;
+
+        const replyChain = haveTileForEvent(this.props.mxEvent)
+            && ReplyChain.shouldDisplayReply(this.props.mxEvent, renderTarget)
             ? <ReplyChain
                 parentEv={this.props.mxEvent}
                 onHeightChanged={this.props.onHeightChanged}
diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
index a48c592bf7..967291d79f 100644
--- a/src/components/views/rooms/SendMessageComposer.tsx
+++ b/src/components/views/rooms/SendMessageComposer.tsx
@@ -57,22 +57,32 @@ import DocumentPosition from "../../../editor/position";
 import { ComposerType } from "../../../dispatcher/payloads/ComposerInsertPayload";
 import { getSlashCommand, isSlashCommand, runSlashCommand, shouldSendAnyway } from "../../../editor/commands";
 
+interface IAddReplyOpts {
+    permalinkCreator?: RoomPermalinkCreator;
+    includeLegacyFallback?: boolean;
+    renderIn?: string[];
+}
+
 function addReplyToMessageContent(
     content: IContent,
     replyToEvent: MatrixEvent,
-    permalinkCreator: RoomPermalinkCreator,
+    opts: IAddReplyOpts = {
+        includeLegacyFallback: true,
+    },
 ): void {
-    const replyContent = ReplyChain.makeReplyMixIn(replyToEvent);
+    const replyContent = ReplyChain.makeReplyMixIn(replyToEvent, opts.renderIn);
     Object.assign(content, replyContent);
 
-    // Part of Replies fallback support - prepend the text we're sending
-    // with the text we're replying to
-    const nestedReply = ReplyChain.getNestedReplyText(replyToEvent, permalinkCreator);
-    if (nestedReply) {
-        if (content.formatted_body) {
-            content.formatted_body = nestedReply.html + content.formatted_body;
+    if (opts.includeLegacyFallback) {
+        // Part of Replies fallback support - prepend the text we're sending
+        // with the text we're replying to
+        const nestedReply = ReplyChain.getNestedReplyText(replyToEvent, opts.permalinkCreator);
+        if (nestedReply) {
+            if (content.formatted_body) {
+                content.formatted_body = nestedReply.html + content.formatted_body;
+            }
+            content.body = nestedReply.body + content.body;
         }
-        content.body = nestedReply.body + content.body;
     }
 }
 
@@ -94,6 +104,7 @@ export function createMessageContent(
     replyToEvent: MatrixEvent,
     relation: IEventRelation,
     permalinkCreator: RoomPermalinkCreator,
+    includeReplyLegacyFallback = true,
 ): IContent {
     const isEmote = containsEmote(model);
     if (isEmote) {
@@ -116,7 +127,11 @@ export function createMessageContent(
     }
 
     if (replyToEvent) {
-        addReplyToMessageContent(content, replyToEvent, permalinkCreator);
+        addReplyToMessageContent(content, replyToEvent, {
+            permalinkCreator,
+            includeLegacyFallback: true,
+            renderIn: ReplyChain.getRenderInMixin(relation),
+        });
     }
 
     if (relation) {
@@ -155,6 +170,7 @@ interface ISendMessageComposerProps extends MatrixClientProps {
     replyToEvent?: MatrixEvent;
     disabled?: boolean;
     onChange?(model: EditorModel): void;
+    includeReplyLegacyFallback?: boolean;
 }
 
 @replaceableComponent("views.rooms.SendMessageComposer")
@@ -169,6 +185,10 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     private dispatcherRef: string;
     private sendHistoryManager: SendHistoryManager;
 
+    static defaultProps = {
+        includeReplyLegacyFallback: true,
+    };
+
     constructor(props: ISendMessageComposerProps, context: React.ContextType<typeof RoomContext>) {
         super(props);
         if (this.props.mxClient.isCryptoEnabled() && this.props.mxClient.isRoomEncrypted(this.props.room.roomId)) {
@@ -350,10 +370,14 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                         return; // errored
                     }
 
-                    if (replyToEvent) {
-                        addReplyToMessageContent(content, replyToEvent, this.props.permalinkCreator);
-                    }
                     attachRelation(content, this.props.relation);
+                    if (replyToEvent) {
+                        addReplyToMessageContent(content, replyToEvent, {
+                            permalinkCreator: this.props.permalinkCreator,
+                            includeLegacyFallback: true,
+                            renderIn: ReplyChain.getRenderInMixin(this.props.relation),
+                        });
+                    }
                 } else {
                     runSlashCommand(cmd, args, this.props.room.roomId, threadId);
                     shouldSend = false;
@@ -378,6 +402,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                     replyToEvent,
                     this.props.relation,
                     this.props.permalinkCreator,
+                    this.props.includeReplyLegacyFallback,
                 );
             }
             // don't bother sending an empty message
diff --git a/test/components/views/rooms/SendMessageComposer-test.tsx b/test/components/views/rooms/SendMessageComposer-test.tsx
index 9a41f64acc..205fc289f2 100644
--- a/test/components/views/rooms/SendMessageComposer-test.tsx
+++ b/test/components/views/rooms/SendMessageComposer-test.tsx
@@ -302,6 +302,7 @@ describe('<SendMessageComposer/>', () => {
                             rel_type: RelationType.Thread,
                             event_id: "myFakeThreadId",
                         }}
+                        includeReplyLegacyFallback={false}
                     />
                 </RoomContext.Provider>
             </MatrixClientContext.Provider>);