diff --git a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
index c3321504ea..4e385cfe2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -127,11 +127,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
if (!isResume) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
} else {
- if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
- } else {
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
- }
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
}
}
diff --git a/app/src/main/res/xml/preferences_privacy.xml b/app/src/main/res/xml/preferences_privacy.xml
index b4082bd125..64bcc29902 100644
--- a/app/src/main/res/xml/preferences_privacy.xml
+++ b/app/src/main/res/xml/preferences_privacy.xml
@@ -11,12 +11,6 @@
android:title="@string/lockApp"
android:summary="@string/lockAppDescription" />
-
-