diff --git a/src/api/datatransfermodel.h b/src/api/datatransfermodel.h
index 1908355917bfc40590596f5dc1f8bae658b34c10..fee2fc7ca07619fd1548e92b60abf67775d8db33 100644
--- a/src/api/datatransfermodel.h
+++ b/src/api/datatransfermodel.h
@@ -73,6 +73,7 @@ public:
 
     void download(const QString& accountId,
                   const QString& convId,
+                  const QString& interactionId,
                   const QString& fileId,
                   const QString& path);
 
diff --git a/src/conversationmodel.cpp b/src/conversationmodel.cpp
index c00a039e47e7f2ffab6f9c3875e045a1262a704d..2581ab33dbb1b87f98f800db51d2d12eda5af6dd 100644
--- a/src/conversationmodel.cpp
+++ b/src/conversationmodel.cpp
@@ -3685,7 +3685,7 @@ ConversationModelPimpl::acceptTransfer(const QString& convUid,
             qWarning() << "Too much duplicates for " << destinationDir << path;
             return;
         }
-        linked.owner.dataTransferModel->download(linked.owner.id, convUid, fileId, path);
+        linked.owner.dataTransferModel->download(linked.owner.id, convUid, interactionId, fileId, path);
     } else {
         qWarning() << "Cannot download file without valid interaction";
     }
diff --git a/src/datatransfermodel.cpp b/src/datatransfermodel.cpp
index 11a55c93cda920eeb9d4f5534fa2ddb84fa71563..146f6ba0249628b277de5c47f28739c5445310cc 100644
--- a/src/datatransfermodel.cpp
+++ b/src/datatransfermodel.cpp
@@ -213,10 +213,11 @@ DataTransferModel::accept(const QString& accountId,
 void
 DataTransferModel::download(const QString& accountId,
                             const QString& convId,
+                            const QString& interactionId,
                             const QString& fileId,
                             const QString& path)
 {
-    ConfigurationManager::instance().downloadFile(accountId, convId, fileId, path);
+    ConfigurationManager::instance().downloadFile(accountId, convId, interactionId, fileId, path);
 }
 
 void
diff --git a/src/messageslist.cpp b/src/messageslist.cpp
index 795b6bbc138400e9bb8ffb10eb16ab966763e44d..92703c2081134d4b12a153dc35d9ae2933238178 100644
--- a/src/messageslist.cpp
+++ b/src/messageslist.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <QCoreApplication>
+#include <stdexcept>
 
 #include "messageslist.h"
 #include "api/interaction.h"
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 25412ec01e5357f98e54b4a1c864a513bd67ecf3..d353b400996f0174dafb6d51ab4ceba8952fcdbd 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -329,11 +329,13 @@ public Q_SLOTS: // METHODS
 
     void downloadFile(const QString& accountId,
                       const QString& convId,
+                      const QString& interactionId,
                       const QString& fileId,
                       const QString& path)
     {
         DRing::downloadFile(accountId.toStdString(),
                             convId.toStdString(),
+                            interactionId.toStdString(),
                             fileId.toStdString(),
                             path.toStdString());
     }