diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss
index 414964f..7203be3 100644
--- a/src/assets/css/chat.scss
+++ b/src/assets/css/chat.scss
@@ -167,6 +167,10 @@ $chat-text-size: 0.7pt;
     font-weight: 400;
     font-size: 22 * $chat-text-size;
     color: #000000;
+    .edit-marker {
+        font-size: 0.8rem;
+        color: #888888;
+    }
 }
 
 .time {
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 71e9c5c..8697689 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -7,7 +7,7 @@
       v-on:scroll="onScroll"
     >
       <div v-for="event in events" :key="event.getId()">
-        <v-hover v-slot="{ hover }" v-if="!event.isRelation()">
+        <v-hover v-slot="{ hover }" v-if="!event.isRelation() && !event.isRedacted() && !event.isRedaction()">
           <div style="position: relative">
             <component
               :is="componentForEvent(event)"
diff --git a/src/components/messages/MessageIncomingText.vue b/src/components/messages/MessageIncomingText.vue
index 953cbf3..da50f04 100644
--- a/src/components/messages/MessageIncomingText.vue
+++ b/src/components/messages/MessageIncomingText.vue
@@ -13,7 +13,9 @@
       </v-avatar>
 
       <div class="bubble">
-        <div class="message">{{ event.getContent().body }}</div>
+        <div class="message">{{ event.getContent().body }}
+          <span class="edit-marker" v-if="event.replacingEventId()">(edited)</span>
+        </div>
         <QuickReactions :event="event" :reactions="reactions" />
       </div>
     </div>
diff --git a/src/components/messages/MessageOutgoingText.vue b/src/components/messages/MessageOutgoingText.vue
index 6932509..29c127f 100644
--- a/src/components/messages/MessageOutgoingText.vue
+++ b/src/components/messages/MessageOutgoingText.vue
@@ -3,7 +3,9 @@
     <div class="messageOut">
       <div class="sender">{{ "You" }}</div>
       <div class="bubble">
-        <div class="message">{{ event.getContent().body }}</div>
+        <div class="message">{{ event.getContent().body }}
+          <span class="edit-marker" v-if="event.replacingEventId()">(edited)</span>
+        </div>
         <QuickReactions :event="event" :reactions="reactions" />
       </div>
       <div class="status">{{ event.status }}</div>