diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
index 96353ca36..4b37875c1 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
@@ -39,10 +39,10 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     findPreference(Prefs.MESSAGE_BODY_TEXT_SIZE_PREF)
             .setOnPreferenceChangeListener(new ListSummaryListener());
 
-    findPreference(Prefs.COMPRESSION)
+    findPreference("pref_compression")
             .setOnPreferenceChangeListener(new ListSummaryListener());
 
-    showEmails = (ListPreferenceWithSummary) this.findPreference(Prefs.SHOW_EMAILS);
+    showEmails = (ListPreferenceWithSummary) this.findPreference("pref_show_emails");
     showEmails.setOnPreferenceChangeListener((preference, newValue) -> {
       updateListSummary(preference, newValue);
       dcContext.setConfigInt(CONFIG_SHOW_EMAILS, Util.objectToInt(newValue));
@@ -74,9 +74,9 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     super.onResume();
     ((ApplicationPreferencesActivity)getActivity()).getSupportActionBar().setTitle(R.string.pref_chats_and_media);
 
-    initializeListSummary((ListPreferenceWithSummary) findPreference(Prefs.COMPRESSION));
+    initializeListSummary((ListPreferenceWithSummary) findPreference("pref_compression"));
 
-    String value = Integer.toString(dcContext.getConfigInt(Prefs.SHOW_EMAILS));
+    String value = Integer.toString(dcContext.getConfigInt("pref_show_emails"));
     showEmails.setValue(value);
     updateListSummary(showEmails, value);
 
diff --git a/src/org/thoughtcrime/securesms/util/Prefs.java b/src/org/thoughtcrime/securesms/util/Prefs.java
index 459bc6c94..7293837a8 100644
--- a/src/org/thoughtcrime/securesms/util/Prefs.java
+++ b/src/org/thoughtcrime/securesms/util/Prefs.java
@@ -11,6 +11,7 @@ import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
+import android.util.Log;
 
 import com.mapbox.mapboxsdk.geometry.LatLng;
 
@@ -54,9 +55,6 @@ public class Prefs {
   private static final String IN_THREAD_NOTIFICATION_PREF      = "pref_key_inthread_notifications";
   public  static final String MESSAGE_BODY_TEXT_SIZE_PREF      = "pref_message_body_text_size";
 
-  public static final String SHOW_EMAILS                       = "pref_show_emails";
-  public static final String COMPRESSION                       = "pref_compression";
-
   public  static final String NOTIFICATION_PRIVACY_PREF        = "pref_notification_privacy";
   public  static final String NOTIFICATION_PRIORITY_PREF       = "pref_notification_priority";