1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
index a35ed043..6643c276 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
@@ -107,7 +107,18 @@ public class FileBackend {
 	}
 
 	public static DownloadableFile getFile(Message message, boolean decrypted) {
-		return new DownloadableFile(getFilePath(message, decrypted));
+        DownloadableFile downloadableFile = new DownloadableFile(getFilePath(message, decrypted));
+        FileParams fileParams = message.getFileParams();
+        if (null != fileParams) {
+            if (null != fileParams.getKey()) {
+                downloadableFile.setKey(fileParams.getKey());
+            }
+            if (null != fileParams.getIv()) {
+                downloadableFile.setIv(fileParams.getIv());
+            }
+        }
+
+		return downloadableFile;
 	}
 
     protected static String getFilePath(Message message, String extension) {