diff --git a/crates/matrix-sdk-base/src/store/send_queue.rs b/crates/matrix-sdk-base/src/store/send_queue.rs
index 289def806e6..992348ed3b4 100644
--- a/crates/matrix-sdk-base/src/store/send_queue.rs
+++ b/crates/matrix-sdk-base/src/store/send_queue.rs
@@ -133,7 +133,7 @@ pub struct QueuedRequest {
     /// should be handled.
     pub priority: usize,
 
-    /// The time that the request was original attempted.
+    /// The time that the request was originally attempted.
     pub created_at: Option<MilliSecondsSinceUnixEpoch>,
 }
 
@@ -376,7 +376,7 @@ pub struct DependentQueuedRequest {
     /// returned by the server once the local echo has been sent out.
     pub parent_key: Option<SentRequestKey>,
 
-    /// The time that the request was original attempted.
+    /// The time that the request was originally attempted.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub created_at: Option<MilliSecondsSinceUnixEpoch>,
 }
diff --git a/crates/matrix-sdk-sqlite/src/state_store.rs b/crates/matrix-sdk-sqlite/src/state_store.rs
index c0e58dcbbe5..52a847d8859 100644
--- a/crates/matrix-sdk-sqlite/src/state_store.rs
+++ b/crates/matrix-sdk-sqlite/src/state_store.rs
@@ -2467,6 +2467,7 @@ mod migration_tests {
 
         Ok(())
     }
+    
     fn add_dependent_send_queue_event_v7(
         this: &SqliteStateStore,
         txn: &Transaction<'_>,
diff --git a/crates/matrix-sdk-ui/src/timeline/event_handler.rs b/crates/matrix-sdk-ui/src/timeline/event_handler.rs
index 9b0ea87d65b..06694df05d5 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_handler.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_handler.rs
@@ -1033,7 +1033,7 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
                 send_state: EventSendState::NotSentYet,
                 transaction_id: txn_id.to_owned(),
                 send_handle: send_handle.clone(),
-                created_at: send_handle.clone().and_then(|h| h.created_at),
+                created_at: send_handle.created_at,
             }
             .into(),
 
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 f632e9371a7..607f3efcfe0 100644
--- a/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
+++ b/crates/matrix-sdk-ui/src/timeline/event_item/mod.rs
@@ -268,7 +268,7 @@ impl EventTimelineItem {
         as_variant!(&self.kind, EventTimelineItemKind::Local(local) => &local.send_state)
     }
 
-    /// Get the local time that the event was enqueued at.
+    /// Get the time that the local event was pushed in the send queue at.
     pub fn local_created_at(&self) -> Option<MilliSecondsSinceUnixEpoch> {
         as_variant!(&self.kind, EventTimelineItemKind::Local(local) => local.created_at).flatten()
     }