1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
index 5e629485..fa403cc5 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
@@ -9,6 +9,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.FileParams;
@@ -172,11 +173,18 @@ public final class MessageUtil {
 
     public static boolean needsDownload(Message message) {
         FileStatus fileStatus = (null != message.getFileParams()) ? message.getFileParams().getFileStatus() : null;
-        return (null == fileStatus
+        return (message.hasFileAttached() || MessageUtil.hasDownloadableLink(message))
+                &&(null == fileStatus
                     || (null != fileStatus && (fileStatus == FileStatus.NEEDS_DOWNLOAD || fileStatus == FileStatus.UNDEFINED)))
                 && message.treatAsDownloadable() != Message.Decision.NEVER;
     }
 
+    public static boolean hasDownloadableLink(Message message) {
+        String url = (null != message.getFileParams()) ? message.getFileParams().getUrl() : null;
+        return ConversationsPlusPreferences.autoDownloadFileLink()
+                && null != url;
+    }
+
     public static boolean isMessageSent(Message message) {
         switch (message.getStatus()) {
             case Message.STATUS_SEND: