diff --git a/plugins/sms/conversationsdbusinterface.cpp b/plugins/sms/conversationsdbusinterface.cpp
index 71407968d..f63fbd3a2 100644
--- a/plugins/sms/conversationsdbusinterface.cpp
+++ b/plugins/sms/conversationsdbusinterface.cpp
@@ -77,7 +77,7 @@ void ConversationsDbusInterface::requestConversation(const qint64& conversationI
 
 void ConversationsDbusInterface::addMessages(const QList<ConversationMessage> &messages)
 {
-    QSet<qint32> updatedConversationIDs;
+    QSet<qint64> updatedConversationIDs;
 
     for (const auto& message : messages) {
         const qint32& threadId = message.threadID();
@@ -122,7 +122,7 @@ QList<ConversationMessage> ConversationsDbusInterface::getConversation(const qin
     return m_conversations.value(conversationID).values();
 }
 
-void ConversationsDbusInterface::updateConversation(const qint32& conversationID)
+void ConversationsDbusInterface::updateConversation(const qint64& conversationID)
 {
     waitingForMessagesLock.lock();
     qCDebug(KDECONNECT_CONVERSATIONS) << "Requesting conversation with ID" << conversationID << "from remote";
diff --git a/smsapp/conversationmodel.h b/smsapp/conversationmodel.h
index 767bac4f2..657e6cdff 100644
--- a/smsapp/conversationmodel.h
+++ b/smsapp/conversationmodel.h
@@ -50,7 +50,7 @@ public:
 
     Q_ENUM(Roles)
 
-    qint32 threadId() const;
+    qint64 threadId() const;
     void setThreadId(const qint64& threadId);
 
     QString deviceId() const { return m_deviceId; }
@@ -67,7 +67,7 @@ private:
     DeviceConversationsDbusInterface* m_conversationsInterface;
     QString m_deviceId;
     qint64 m_threadId = INVALID_THREAD_ID;
-    QSet<qint32> knownMessageIDs;
+    QSet<qint32> knownMessageIDs; // Set of known Message uIDs
 };
 
 #endif // CONVERSATIONMODEL_H