diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 069298e48fa9179aaf7e7c2019c56eedda7b99b9..84a9985dc147610ee246ebe7d559576c29f8b192 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1906,7 +1906,9 @@ public class XmppConnectionService extends Service {
                                             message.addPayload(fallback);
                                         }
 
+                                        final int encryption = message.getEncryption();
                                         getHttpConnectionManager().createNewDownloadConnection(message, false, (file) -> {
+                                            message.setEncryption(encryption);
                                             synchronized (message.getConversation()) {
                                                 if (message.getStatus() == Message.STATUS_WAITING) sendMessage(message, true, true, false);
                                             }