diff --git a/crates/matrix-sdk-ui/src/timeline/event_handler.rs b/crates/matrix-sdk-ui/src/timeline/event_handler.rs
index 50b7dd90b..427c77bc6 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_handler.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_handler.rs
@@ -52,9 +52,9 @@ use super::{
     controller::{PendingEditKind, TimelineMetadata, TimelineStateTransaction},
     day_dividers::DayDividerAdjuster,
     event_item::{
-        extract_edit_content, AnyOtherFullStateEventContent, EventSendState, EventTimelineItemKind,
-        LocalEventTimelineItem, PollState, Profile, ReactionsByKeyBySender, RemoteEventOrigin,
-        RemoteEventTimelineItem, TimelineEventItemId,
+        extract_room_msg_edit_content, AnyOtherFullStateEventContent, EventSendState,
+        EventTimelineItemKind, LocalEventTimelineItem, PollState, Profile, ReactionsByKeyBySender,
+        RemoteEventOrigin, RemoteEventTimelineItem, TimelineEventItemId,
     },
     reactions::FullReactionKey,
     util::{rfind_event_by_id, rfind_event_item},
@@ -346,7 +346,7 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
                                     _ => None,
                                 });
 
-                        let (edit_json, edit_content) = extract_edit_content(relations)
+                        let (edit_json, edit_content) = extract_room_msg_edit_content(relations)
                             .map(|content| {
                                 let edit_json = as_variant!(&self.ctx.flow, Flow::Remote { raw_event, ..} => raw_event).and_then(|raw| {
                                     // Kids, don't do this at home. We're extracting the edit event
diff --git a/crates/matrix-sdk-ui/src/timeline/event_item/content/message.rs b/crates/matrix-sdk-ui/src/timeline/event_item/content/message.rs
index 6d04d72cf..4c16523e0 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_item/content/message.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_item/content/message.rs
@@ -164,7 +164,7 @@ impl From<Message> for RoomMessageEventContent {
 
 /// Extracts a replacement for a room message, if present in the bundled
 /// relations.
-pub(crate) fn extract_edit_content(
+pub(crate) fn extract_room_msg_edit_content(
     relations: BundledMessageLikeRelations<AnySyncMessageLikeEvent>,
 ) -> Option<RoomMessageEventContentWithoutRelation> {
     match *relations.replace? {
@@ -320,7 +320,7 @@ impl RepliedToEvent {
 
         let content = TimelineItemContent::Message(Message::from_event(
             c,
-            extract_edit_content(event.relations()),
+            extract_room_msg_edit_content(event.relations()),
             &vector![],
         ));
         let sender = event.sender().to_owned();
diff --git a/crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs b/crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs
index f76a7238f..9e62f927b 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs
@@ -66,7 +66,7 @@ mod polls;
 
 pub use pinned_events::RoomPinnedEventsChange;
 
-pub(in crate::timeline) use self::{message::extract_edit_content, polls::ResponseData};
+pub(in crate::timeline) use self::{message::extract_room_msg_edit_content, polls::ResponseData};
 pub use self::{
     message::{InReplyToDetails, Message, RepliedToEvent},
     polls::{PollResult, PollState},
diff --git a/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs b/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
index 853f85a05..1de842ab2 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
@@ -42,7 +42,7 @@ mod local;
 mod remote;
 
 pub(super) use self::{
-    content::{extract_edit_content, ResponseData},
+    content::{extract_room_msg_edit_content, ResponseData},
     local::LocalEventTimelineItem,
     remote::{RemoteEventOrigin, RemoteEventTimelineItem},
 };