1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
index 4eedfcf3f..2293cb7ea 100644
--- a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
+++ b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
@@ -106,11 +106,12 @@ public class HttpUploadConnection implements Transferable {
         } else {
             this.mime = this.file.getMimeType();
         }
+        final long originalFileSize = file.getSize();
         this.delayed = delay;
         if (Config.ENCRYPT_ON_HTTP_UPLOADED
                 || message.getEncryption() == Message.ENCRYPTION_AXOLOTL
                 || message.getEncryption() == Message.ENCRYPTION_OTR) {
-            this.key = new byte[48];
+            this.key = new byte[44];
             mXmppConnectionService.getRNG().nextBytes(this.key);
             this.file.setKeyAndIv(this.key);
         }
@@ -129,7 +130,7 @@ public class HttpUploadConnection implements Transferable {
             md5 = null;
         }
 
-        this.file.setExpectedSize(file.getSize() + (file.getKey() != null ? 16 : 0));
+        this.file.setExpectedSize(originalFileSize + (file.getKey() != null ? 16 : 0));
         message.resetFileParams();
         this.mSlotRequester.request(method, account, file, mime, md5, new SlotRequester.OnSlotRequested() {
             @Override