+
dispatchShowThreadEvent(this.props.mxEvent)}
+ key="mx_EventTile_line"
+ >
{ linkedTimestamp }
{ this.renderE2EPadlock() }
{ replyChain }
@@ -1359,19 +1372,21 @@ export default class EventTile extends React.Component {
tileShape={this.props.tileShape}
/>
{ keyRequestInfo }
-
- dispatchShowThreadEvent(this.props.mxEvent)}
- key="thread"
- />
-
-
- { this.renderThreadLastMessagePreview() }
+ { this.renderThreadPanelSummary() }
+
+ dispatchShowThreadEvent(this.props.mxEvent)}
+ key="thread"
+ />
+
+
{ msgOption }
>)
);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 86d77489cb..a25ee37386 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1573,7 +1573,7 @@
"Key request sent.": "Key request sent.",
"
Re-request encryption keys from your other sessions.": "
Re-request encryption keys from your other sessions.",
"Message Actions": "Message Actions",
- "Thread": "Thread",
+ "Reply in thread": "Reply in thread",
"This message cannot be decrypted": "This message cannot be decrypted",
"Encrypted by an unverified session": "Encrypted by an unverified session",
"Unencrypted": "Unencrypted",
@@ -1864,7 +1864,6 @@
"%(count)s people|one": "%(count)s person",
"Show files": "Show files",
"Export chat": "Export chat",
- "Show threads": "Show threads",
"Share room": "Share room",
"Room settings": "Room settings",
"Trusted": "Trusted",
@@ -3012,6 +3011,7 @@
"All threads": "All threads",
"Shows all threads from current room": "Shows all threads from current room",
"Show:": "Show:",
+ "Thread": "Thread",
"Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
"Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
"Failed to load timeline position": "Failed to load timeline position",