1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java b/src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java
index 0d246795d..ed944b45a 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java
@@ -191,7 +191,12 @@ public class SQLiteAxolotlStore implements AxolotlStore {
             String fingerprint = identityKey.getFingerprint().replaceAll("\\s", "");
             FingerprintStatus status = getFingerprintStatus(fingerprint);
             if (status == null) {
-                status = FingerprintStatus.createActiveUndecided(); //default for new keys
+                if (mXmppConnectionService.blindTrustBeforeVerification() && !account.getAxolotlService().hasVerifiedKeys(name)) {
+                    Log.d(Config.LOGTAG,account.getJid().toBareJid()+": blindly trusted "+fingerprint+" of "+name);
+                    status = FingerprintStatus.createActiveTrusted();
+                } else {
+                    status = FingerprintStatus.createActiveUndecided();
+                }
             } else {
                 status = status.toActive();
             }