diff --git a/solanaceae/tox_messages/tox_message_manager.cpp b/solanaceae/tox_messages/tox_message_manager.cpp
index 0f3af79..d9b3482 100644
--- a/solanaceae/tox_messages/tox_message_manager.cpp
+++ b/solanaceae/tox_messages/tox_message_manager.cpp
@@ -294,6 +294,8 @@ bool ToxMessageManager::onToxEvent(const Tox_Event_Group_Message* e) {
 		reg.get_or_emplace<Message::Components::SyncedBy>(new_msg_e).ts.emplace(self_c, ts);
 	}
 
+	reg.get_or_emplace<Message::Components::Remote::TimestampReceived>(new_msg_e).ts.try_emplace(self_c, ts);
+
 	_rmm.throwEventConstruct(reg, new_msg_e);
 	return false; // TODO: true?
 }
@@ -340,6 +342,8 @@ bool ToxMessageManager::onToxEvent(const Tox_Event_Group_Private_Message* e) {
 	reg.emplace<Message::Components::TagUnread>(new_msg_e);
 
 	// private does not track synced by
+	// but receive state
+	reg.get_or_emplace<Message::Components::Remote::TimestampReceived>(new_msg_e).ts.try_emplace(self_c, ts);
 
 	_rmm.throwEventConstruct(reg, new_msg_e);
 	return false;