diff --git a/web/src/message_edit_history.ts b/web/src/message_edit_history.ts
index 590bf00b14..0b8adbb8cf 100644
--- a/web/src/message_edit_history.ts
+++ b/web/src/message_edit_history.ts
@@ -114,11 +114,18 @@ function hide_loading_indicator(): void {
 }
 
 export function fetch_and_render_message_history(message: Message): void {
+    assert(message_lists.current !== undefined);
+    const message_container = message_lists.current.view.message_containers.get(message.id);
+    assert(message_container !== undefined);
     const move_history_only =
         realm.realm_message_edit_history_visibility_policy ===
         message_edit_history_visibility_policy_values.moves_only.code;
     $("#message-edit-history-overlay-container").html(
-        render_message_history_overlay({move_history_only}),
+        render_message_history_overlay({
+            moved: message_container.moved,
+            edited: message_container.edited,
+            move_history_only,
+        }),
     );
     open_overlay();
     show_loading_indicator();
diff --git a/web/templates/message_history_overlay.hbs b/web/templates/message_history_overlay.hbs
index e1842c3e0f..fd0c067e41 100644
--- a/web/templates/message_history_overlay.hbs
+++ b/web/templates/message_history_overlay.hbs
@@ -5,7 +5,15 @@
                 {{#if move_history_only}}
                 <h1>{{t "Message move history" }}</h1>
                 {{else}}
-                <h1>{{t "Message edit history" }}</h1>
+                {{#if edited}}
+                    {{#if moved}}
+                    <h1>{{t "Message edit and move history" }}</h1>
+                    {{else}}
+                    <h1>{{t "Message edit history" }}</h1>
+                    {{/if}}
+                {{else if moved}}
+                    <h1>{{t "Message move history" }}</h1>
+                {{/if}}
                 {{/if}}
                 <div class="exit">
                     <span class="exit-sign">&times;</span>