1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 1470d250..b47ff96c 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -184,7 +184,9 @@ public class HttpDownloadConnection implements Transferable {
 				return;
 			}
 			file.setExpectedSize(size);
-			if (size != -1 && size <= ConversationsPlusPreferences.autoAcceptFileSize()) {
+			if (size != -1
+                    && size <= ConversationsPlusPreferences.autoAcceptFileSize()
+                    && mXmppConnectionService.isDownloadAllowedInConnection()) {
 				HttpDownloadConnection.this.acceptedAutomatically = true;
 				new Thread(new FileDownloader(interactive)).start();
 			} else {