2 files changed, 4 insertions(+), 1 deletions(-)

M module-db/Interface/SMSRecord.cpp
M test/pytest/service-desktop/test_messages.py

@@ 409,8 409,9 @@ std::unique_ptr<db::QueryResult> SMSRecordInterface::addQuery(const std::shared_
     auto record           = localQuery->record;
     const auto result     = Add(record);
     if (result) {
-        record.ID = GetLastID();
+        record = GetByID(GetLastID());
     }
+
     auto response = std::make_unique<db::query::SMSAddResult>(record, result);
     response->setRequestQuery(query);
     response->setRecordID(record.ID);

@@ 89,6 89,8 @@ def test_add_and_delete_message(harness):
     result, message_record = messages_tester.add_message(message_number, message_body)
     assert result, "Failed to add message!"
     assert message_record["messageBody"] == message_body, "Message body corrupted!"
+    assert message_record["messageID"] > 0, "Message ID not correct!"
+    assert message_record["threadID"] > 0, "Thread ID not correct!"
 
     result, received_messages_records_count = messages_tester.get_messages_count()
     assert result, "Failed to get messages count!"