diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a90e0d9ac4..419632c271 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -165,11 +165,6 @@
           android:windowSoftInputMode="stateHidden"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".AutoInitiateActivity"
-              android:theme="@style/TextSecure.Light.Dialog"
-              android:label="@string/AndroidManifest__textsecure_detected"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".ViewIdentityActivity"
               android:label="@string/AndroidManifest__public_identity_key"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -186,7 +181,6 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ReceiveKeyActivity"
-              android:label="@string/AndroidManifest__complete_key_exchange"
               android:theme="@style/TextSecure.Light.Dialog"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
     
diff --git a/res/layout/auto_initiate_activity.xml b/res/layout/auto_initiate_activity.xml
deleted file mode 100644
index 1925c3a769..0000000000
--- a/res/layout/auto_initiate_activity.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip">
-
-    <TextView android:id="@+id/description_text"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginTop="5dip"
-              android:layout_marginBottom="5dip"
-              android:textAppearance="?android:attr/textAppearanceMedium"                
-              android:text="@string/auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session"/>    
-
-    <LinearLayout android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:layout_marginTop="16dip"
-                  android:layout_marginBottom="16dip"
-                  android:gravity="right">
-
-        <TableLayout android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:stretchColumns="*">
-            <TableRow>
-		        <Button android:id="@+id/initiate_button"
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content"
-		                android:text="@string/auto_initiate_activity__initiate_exchange"
-		                android:gravity="center"/>
-		
-		        <Button android:id="@+id/cancel_button"
-		                android:text="@android:string/cancel"
-		                android:layout_width="wrap_content"
-		                android:layout_height="wrap_content"
-		                android:gravity="center"/>
-            </TableRow>
-        </TableLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java b/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java
index a179fa4532..91f150ac32 100644
--- a/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java
+++ b/src/org/thoughtcrime/securesms/ReceiveKeyActivity.java
@@ -32,7 +32,6 @@ import android.widget.TextView;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.PushDatabase;
@@ -49,7 +48,6 @@ import org.whispersystems.libaxolotl.InvalidMessageException;
 import org.whispersystems.libaxolotl.InvalidVersionException;
 import org.whispersystems.libaxolotl.LegacyMessageException;
 import org.whispersystems.libaxolotl.protocol.PreKeyWhisperMessage;
-import org.whispersystems.libaxolotl.state.IdentityKeyStore;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
 import org.whispersystems.textsecure.api.messages.TextSecureGroup;
@@ -100,18 +98,6 @@ public class ReceiveKeyActivity extends BaseActivity {
   }
 
   private void initializeText() {
-    if (isTrusted(this.identityKey)) {
-      initializeTrustedText();
-    } else {
-      initializeUntrustedText();
-    }
-  }
-
-  private void initializeTrustedText() {
-    descriptionText.setText(getString(R.string.ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but));
-  }
-
-  private void initializeUntrustedText() {
     SpannableString spannableString = new SpannableString(getString(R.string.ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different) + " " +
                                                           getString(R.string.ReceiveKeyActivity_you_may_wish_to_verify_this_contact));
     spannableString.setSpan(new ClickableSpan() {
@@ -130,12 +116,6 @@ public class ReceiveKeyActivity extends BaseActivity {
     descriptionText.setMovementMethod(LinkMovementMethod.getInstance());
   }
 
-  private boolean isTrusted(IdentityKey identityKey) {
-    IdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(this, masterSecret);
-
-    return identityKeyStore.isTrustedIdentity(recipient.getNumber(), identityKey);
-  }
-
   private void initializeKey()
       throws InvalidKeyException, InvalidVersionException,
              InvalidMessageException, LegacyMessageException