From d2f5bd84a8fc58346dcd9549daf6d03383a2c583 Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Mon, 16 Feb 2026 18:34:20 -0800
Subject: [PATCH] Make broadcast timestamp match fallback logic used for
 storage

---
 app/event_handlers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/event_handlers.py b/app/event_handlers.py
index f1f893e..cd729df 100644
--- a/app/event_handlers.py
+++ b/app/event_handlers.py
@@ -131,7 +131,7 @@ async def on_contact_message(event: "Event") -> None:
             "type": "PRIV",
             "conversation_key": sender_pubkey,
             "text": payload.get("text", ""),
-            "sender_timestamp": payload.get("sender_timestamp"),
+            "sender_timestamp": payload.get("sender_timestamp") or received_at,
             "received_at": received_at,
             "paths": paths,
             "txt_type": txt_type,