diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 748f77ba77..c4d0f14a77 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -66,11 +66,6 @@
android:title="@string/preferences__complete_key_exchanges"
android:summary="@string/preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key" />
-
-
= 1) &&
- PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.SEND_IDENTITY_PREF, true);
+ return IdentityKeyUtil.hasIdentityKey(context) && (messageVersion >= 1);
}