diff --git a/res/layout/passphrase_timeout_dialog.xml b/res/layout/passphrase_timeout_dialog.xml
deleted file mode 100644
index 166f7868ba..0000000000
--- a/res/layout/passphrase_timeout_dialog.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="vertical"			  
-			  android:layout_height="wrap_content"  			
-			  android:layout_width="fill_parent"
-  			  android:paddingLeft="5dip"
-  			  android:paddingRight="5dip">	
-
-	<LinearLayout android:orientation="horizontal"
-				  android:layout_height="wrap_content"
-				  android:layout_width="wrap_content"
-				  android:layout_margin="15dip">
-
-		<TextView android:id="@+id/timeout_text"
-				  android:layout_width="wrap_content"
-				  android:layout_height="wrap_content"
-				  android:layout_marginRight="10dip"
-				  android:textSize="30dip" />
-		
-		<Spinner android:id="@+id/scale"
-				 android:layout_width="wrap_content"
-				 android:layout_height="wrap_content"
-				 android:entries="@array/minutes_hours"/>
-
-	</LinearLayout>			  
-	<SeekBar android:id="@+id/seekbar"
-			 android:layout_width="fill_parent"
-			 android:layout_height="wrap_content"
-			 android:layout_margin="15dip"
-			 android:max="1440"/>
-			 
-</LinearLayout>
diff --git a/src/org/thoughtcrime/securesms/preferences/PassphraseTimeoutPreference.java b/src/org/thoughtcrime/securesms/preferences/PassphraseTimeoutPreference.java
deleted file mode 100644
index d1865bfce5..0000000000
--- a/src/org/thoughtcrime/securesms/preferences/PassphraseTimeoutPreference.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Copyright (C) 2011 Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.preferences;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Color;
-import android.os.Build;
-import android.preference.DialogPreference;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-
-/**
- * Dialog preference for encryption passphrase timeout.
- *
- * @author Moxie Marlinspike
- */
-
-public class PassphraseTimeoutPreference extends DialogPreference {
-
-  private Spinner scaleSpinner;
-  private SeekBar seekBar;
-  private TextView timeoutText;
-
-  public PassphraseTimeoutPreference(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    this.setDialogLayoutResource(R.layout.passphrase_timeout_dialog);
-    this.setPositiveButtonText(android.R.string.ok);
-    this.setNegativeButtonText(android.R.string.cancel);
-  }
-
-  @Override
-  protected View onCreateDialogView() {
-    View dialog       = super.onCreateDialogView();
-    this.scaleSpinner = (Spinner)dialog.findViewById(R.id.scale);
-    this.seekBar      = (SeekBar)dialog.findViewById(R.id.seekbar);
-    this.timeoutText  = (TextView)dialog.findViewById(R.id.timeout_text);
-
-    // Can't figure out how to style a DialogPreference.
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      this.timeoutText.setTextColor(Color.parseColor("#cccccc"));
-    }
-
-    initializeDefaults();
-    initializeListeners();
-
-    return dialog;
-  }
-
-  @Override
-  public void onClick(DialogInterface dialog, int which) {
-    if (which == DialogInterface.BUTTON_POSITIVE) {
-      int interval;
-
-      if (scaleSpinner.getSelectedItemPosition() == 0) {
-        interval = Math.max(seekBar.getProgress(), 1);
-      } else {
-        interval = Math.max(seekBar.getProgress(), 1) * 60;
-      }
-
-      TextSecurePreferences.setPassphraseTimeoutInterval(getContext(), interval);
-    }
-
-    super.onClick(dialog, which);
-  }
-
-  private void initializeDefaults() {
-    int timeout = TextSecurePreferences.getPassphraseTimeoutInterval(getContext());
-
-    if (timeout > 60) {
-      scaleSpinner.setSelection(1);
-      seekBar.setMax(24);
-      seekBar.setProgress(timeout / 60);
-      timeoutText.setText((timeout / 60) + "");
-    } else {
-      scaleSpinner.setSelection(0);
-      seekBar.setMax(60);
-      seekBar.setProgress(timeout);
-      timeoutText.setText(timeout + "");
-    }
-  }
-
-  private void initializeListeners() {
-    this.seekBar.setOnSeekBarChangeListener(new SeekbarChangedListener());
-    this.scaleSpinner.setOnItemSelectedListener(new ScaleSelectedListener());
-  }
-
-  private class ScaleSelectedListener implements AdapterView.OnItemSelectedListener {
-    @Override
-    public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long selected) {
-      if (selected == 0) {
-        seekBar.setMax(60);
-      } else {
-        seekBar.setMax(24);
-      }
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> arg0) {
-    }
-  }
-
-  private class SeekbarChangedListener implements SeekBar.OnSeekBarChangeListener {
-
-    @Override
-    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-      if (progress < 1)
-        progress = 1;
-
-      timeoutText.setText(progress +"");
-    }
-
-    @Override
-    public void onStartTrackingTouch(SeekBar seekBar) {
-    }
-
-    @Override
-    public void onStopTrackingTouch(SeekBar seekBar) {
-    }
-
-  }
-
-}