diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
index 34a0361bc..4adfa2709 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrCodeHandler.java
@@ -55,8 +55,13 @@ public class QrCodeHandler {
                 showFingerPrintError(builder, nameAndAddress);
                 break;
 
-            case DcContext.DC_QR_FPR_OK:
             case DcContext.DC_QR_ADDR:
+                if (dcContext.isChatmail()) {
+                    dcContext.deleteContact(qrParsed.getId());
+                    DcHelper.showEncryptionRequiredDialog(activity, nameAndAddress);
+                    return;
+                }
+            case DcContext.DC_QR_FPR_OK:
                 showFingerprintOrQrSuccess(builder, qrParsed, nameAndAddress);
                 break;