diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 43c28b854cc5a6af8cdd121d82342d6c8d1b1485..81f3f80bce0dcffff62a147fcdc5b9eaebcd4a1d 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
@@ -53,20 +53,11 @@ public class AbstractConnectionManager {
         }
     }
 
-
-    public static OutputStream createAppendedOutputStream(DownloadableFile file) {
-        return createOutputStream(file, true);
-    }
-
-    public static OutputStream createOutputStream(DownloadableFile file) {
-        return createOutputStream(file, false);
-    }
-
-    private static OutputStream createOutputStream(DownloadableFile file, boolean append) {
+    public static OutputStream createOutputStream(DownloadableFile file, boolean append, boolean decrypt) {
         FileOutputStream os;
         try {
             os = new FileOutputStream(file, append);
-            if (file.getKey() == null) {
+            if (file.getKey() == null || !decrypt) {
                 return os;
             }
         } catch (FileNotFoundException e) {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 2596f9960c0e7ccfe8840ce43ba4ea5be5c47c95..3b2909cc7df4494f5dd4f83bb4ee32785a93ec5d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -213,7 +213,7 @@ public class JingleConnection implements Transferable {
         }
         this.file.getParentFile().mkdirs();
         this.file.createNewFile();
-        this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file);
+        this.mFileOutputStream = AbstractConnectionManager.createOutputStream(this.file, false, true);
         return this.mFileOutputStream;
     }