diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h
index d7e7911a..9a0aee1d 100644
--- a/include/timeline/TimelineItem.h
+++ b/include/timeline/TimelineItem.h
@@ -83,6 +83,7 @@ public:
         void setUserAvatar(const QImage &pixmap);
         DescInfo descriptionMessage() const { return descriptionMsg_; }
         QString eventId() const { return event_id_; }
+        void setEventId(const QString &event_id) { event_id_ = event_id; }
 
         ~TimelineItem();
 
diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cc
index 3c8b3604..d21f30f0 100644
--- a/src/timeline/TimelineView.cc
+++ b/src/timeline/TimelineView.cc
@@ -460,6 +460,10 @@ TimelineView::updatePendingMessage(int txn_id, QString event_id)
             pending_msgs_.head().txn_id == txn_id) { // We haven't received it yet
                 auto msg     = pending_msgs_.dequeue();
                 msg.event_id = event_id;
+
+                if (msg.widget)
+                        msg.widget->setEventId(event_id);
+
                 pending_sent_msgs_.append(msg);
         }