1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
index 686587c7..011e2529 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
@@ -20,8 +20,8 @@ import javax.net.ssl.X509TrustManager;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
-import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.SSLSocketHelper;
 
 public class HttpConnectionManager extends AbstractConnectionManager {
@@ -38,11 +38,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);