diff --git a/src/components/status/status.js b/src/components/status/status.js
index a925f30be52cb8af430caccdfe397eb3d85bbf88..b7f20374708a7cfd614924aefb17f173014e9f32 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -392,6 +392,12 @@ const Status = {
     },
     visibilityLocalized () {
       return this.$i18n.t('general.scope_in_timeline.' + this.status.visibility)
+    },
+    isEdited () {
+      return this.status.edited_at !== null
+    },
+    editingAvailable () {
+      return this.$store.state.instance.editingAvailable
     }
   },
   methods: {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index b3ad3818c6c6b1b0c62d40d7a9040857cf363c4c..ada9841e414fd2e70e9014f202455f585df58019 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -156,7 +156,8 @@
     margin-right: 0.2em;
   }
 
-  & .heading-reply-row {
+  & .heading-reply-row,
+  & .heading-edited-row {
     position: relative;
     align-content: baseline;
     font-size: 0.85em;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 67ce999a45e100197d716a7ca63830da5d900f91..00462f0ae11ca51eb38385e77b175dac9eef9dc4 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -328,6 +328,30 @@
                 class="mentions-line"
               />
             </div>
+            <div
+              v-if="isEdited && editingAvailable && !isPreview"
+              class="heading-edited-row"
+            >
+              <i18n-t
+                keypath="status.edited_at"
+                tag="span"
+              >
+                <template #time>
+                  <i18n-t
+                    keypath="time.in_past"
+                    tag="span"
+                  >
+                    <template>
+                      <Timeago
+                        :time="status.edited_at"
+                        :auto-update="60"
+                        :long-format="true"
+                      />
+                    </template>
+                  </i18n-t>
+                </template>
+              </i18n-t>
+            </div>
           </div>
 
           <StatusContent
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f125c2496bc9480d57a8984b08c6c525b85abd82..c4a044f5d9c5caeac42f99e00f9fbc76e98bb74b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -748,6 +748,7 @@
     "repeats": "Repeats",
     "delete": "Delete status",
     "edit": "Edit status",
+    "edited_at": "(last edited {time})",
     "pin": "Pin on profile",
     "unpin": "Unpin from profile",
     "pinned": "Pinned",