1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
index 3f6f8ce7..bba52954 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
+++ b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java
@@ -33,12 +33,18 @@ import de.thedevstack.conversationsplus.ui.UiCallback;
 public class PgpEngine {
 	private OpenPgpApi api;
 	private XmppConnectionService mXmppConnectionService;
+    private static PgpEngine INSTANCE;
 
 	public PgpEngine(OpenPgpApi api, XmppConnectionService service) {
 		this.api = api;
 		this.mXmppConnectionService = service;
+        INSTANCE = this;
 	}
 
+    public static PgpEngine getInstance() {
+        return INSTANCE;
+    }
+
 	public void decrypt(final Message message, final UiCallback<Message> callback) {
 		Intent params = new Intent();
 		params.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY);
@@ -62,7 +68,7 @@ public class PgpEngine {
 								final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager();
 								if (message.trusted()
 										&& message.treatAsDownloadable() != Message.Decision.NEVER
-                                        && ConversationsPlusPreferences.autoDownloadFileLink()
+                                        && (message.isHttpUploaded() || ConversationsPlusPreferences.autoDownloadFileLink())
 										&& ConversationsPlusPreferences.autoAcceptFileSize() > 0) {
 									manager.createNewDownloadConnection(message);
 								}