diff --git a/src/omikron/omikron_connection.rs b/src/omikron/omikron_connection.rs
index 12aea5d..240da6f 100755
--- a/src/omikron/omikron_connection.rs
+++ b/src/omikron/omikron_connection.rs
@@ -575,6 +575,10 @@ impl OmikronConnection {
                         .with_id(cv.get_id())
                         .with_receiver(sender_id as u64)
                         .with_sender(receiver_id as u64)
+                        .add_data(
+                            DataTypes::chat_partner_id,
+                            DataValue::Number(sender_id as i64),
+                        )
                         .add_data(DataTypes::send_time, DataValue::Number(timestamp_i64))
                         .add_data(
                             DataTypes::message_state,
@@ -605,6 +609,10 @@ impl OmikronConnection {
                         .with_receiver(sender_id as u64)
                         .with_sender(receiver_id as u64)
                         .add_data(DataTypes::send_time, DataValue::Number(timestamp_i64))
+                        .add_data(
+                            DataTypes::chat_partner_id,
+                            DataValue::Number(sender_id as i64),
+                        )
                         .add_data(
                             DataTypes::message_state,
                             DataValue::Str(MessageState::Sent.as_str().to_string()),
@@ -685,6 +693,10 @@ impl OmikronConnection {
                         .with_receiver(*sender_id)
                         .with_sender(*receiver_id)
                         .add_data(DataTypes::send_time, DataValue::Number(timestamp))
+                        .add_data(
+                            DataTypes::chat_partner_id,
+                            DataValue::Number(*sender_id as i64),
+                        )
                         .add_data(
                             DataTypes::message_state,
                             DataValue::Str(ms.as_str().to_string()),
@@ -706,6 +718,10 @@ impl OmikronConnection {
                         .with_receiver(*sender_id)
                         .with_sender(*receiver_id)
                         .add_data(DataTypes::send_time, DataValue::Number(timestamp))
+                        .add_data(
+                            DataTypes::chat_partner_id,
+                            DataValue::Number(*sender_id as i64),
+                        )
                         .add_data(
                             DataTypes::message_state,
                             DataValue::Str(MessageState::Sent.as_str().to_string()),