1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
index a1ad3c01..e3398f93 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
@@ -19,6 +19,7 @@ import javax.net.ssl.X509TrustManager;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.AbstractConnectionManager;
 import eu.siacs.conversations.services.XmppConnectionService;
@@ -39,11 +40,14 @@ public class HttpConnectionManager extends AbstractConnectionManager {
 	}
 
 	public static HttpDownloadConnection createNewDownloadConnection(Message message, boolean interactive) {
+        if (MessageUtil.needsDownload(message)) {
             HttpDownloadConnection connection = new HttpDownloadConnection(INSTANCE);
             connection.init(message, interactive);
             INSTANCE.downloadConnections.add(connection);
             return connection;
         }
+		return null;
+	}
 
 	public void finishConnection(HttpDownloadConnection connection) {
 		this.downloadConnections.remove(connection);