diff --git a/build.gradle b/build.gradle
index c8bd355652..af179f75b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,6 +47,10 @@ dependencies {
         exclude module: 'support-v4'
     }
     compile 'com.squareup.dagger:dagger:1.2.2'
+    compile 'com.doomonafireball.betterpickers:library:1.5.2'
+    compile ("com.doomonafireball.betterpickers:library:1.5.2") {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
     provided 'com.squareup.dagger:dagger-compiler:1.2.2'
 
     compile 'org.whispersystems:jobmanager:0.9.0'
diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml
index a527c98d65..93451d7fb2 100644
--- a/res/xml/preferences_app_protection.xml
+++ b/res/xml/preferences_app_protection.xml
@@ -17,13 +17,9 @@
                         android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval"
                         android:dependency="pref_enable_passphrase_temporary"/>
 
-    <org.thoughtcrime.securesms.preferences.PassphraseTimeoutPreference
-        android:key="pref_timeout_interval"
-        android:defaultValue="300"
-        android:title="@string/preferences__pref_timeout_interval_title"
-        android:summary="@string/preferences__the_amount_of_time_to_wait_before_forgetting_passphrase"
-        android:dependency="pref_timeout_passphrase"
-        android:dialogTitle="@string/preferences__pref_timeout_interval_dialogtitle" />
+    <Preference android:title="@string/preferences__pref_timeout_interval_title"
+                android:key="pref_timeout_interval"
+                android:dependency="pref_timeout_passphrase"/>
 
     <CheckBoxPreference android:defaultValue="true"
                         android:key="pref_screen_security"
diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index 776e7f85a5..b6ea439611 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -10,8 +10,12 @@ import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.support.v4.preference.PreferenceFragment;
+import android.util.Log;
 import android.widget.Toast;
 
+import com.doomonafireball.betterpickers.hmspicker.HmsPickerBuilder;
+import com.doomonafireball.betterpickers.hmspicker.HmsPickerDialogFragment;
+
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.PassphraseChangeActivity;
 import org.thoughtcrime.securesms.R;
@@ -21,6 +25,8 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import java.util.concurrent.TimeUnit;
+
 public class AppProtectionPreferenceFragment extends PreferenceFragment {
   private CheckBoxPreference disablePassphrase;
 
@@ -32,16 +38,20 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
     disablePassphrase = (CheckBoxPreference) this.findPreference("pref_enable_passphrase_temporary");
 
     this.findPreference(TextSecurePreferences.CHANGE_PASSPHRASE_PREF)
-      .setOnPreferenceClickListener(new ChangePassphraseClickListener());
+        .setOnPreferenceClickListener(new ChangePassphraseClickListener());
+    this.findPreference(TextSecurePreferences.PASSPHRASE_TIMEOUT_INTERVAL_PREF)
+        .setOnPreferenceClickListener(new PassphraseIntervalClickListener());
     disablePassphrase
-      .setOnPreferenceChangeListener(new DisablePassphraseClickListener());
+        .setOnPreferenceChangeListener(new DisablePassphraseClickListener());
   }
 
   @Override
   public void onResume() {
     super.onResume();
     ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.preferences__app_protection);
+
     initializePlatformSpecificOptions();
+    initializeTimeoutSummary();
 
     disablePassphrase.setChecked(!TextSecurePreferences.isPasswordDisabled(getActivity()));
   }
@@ -56,6 +66,12 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
     }
   }
 
+  private void initializeTimeoutSummary() {
+    int timeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(getActivity());
+    this.findPreference(TextSecurePreferences.PASSPHRASE_TIMEOUT_INTERVAL_PREF)
+        .setSummary(String.format("%d minutes", timeoutMinutes));
+  }
+
   private class ChangePassphraseClickListener implements Preference.OnPreferenceClickListener {
     @Override
     public boolean onPreferenceClick(Preference preference) {
@@ -71,6 +87,28 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
     }
   }
 
+  private class PassphraseIntervalClickListener implements Preference.OnPreferenceClickListener, HmsPickerDialogFragment.HmsPickerDialogHandler {
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+      new HmsPickerBuilder().setFragmentManager(getFragmentManager())
+                            .setStyleResId(R.style.BetterPickersDialogFragment_Light)
+                            .addHmsPickerDialogHandler(this)
+                            .show();
+      return true;
+    }
+
+    @Override
+    public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
+      int timeoutMinutes = Math.max((int)TimeUnit.HOURS.toMinutes(hours) +
+                                    minutes                         +
+                                    (int)TimeUnit.SECONDS.toMinutes(seconds), 1);
+
+      TextSecurePreferences.setPassphraseTimeoutInterval(getActivity(), timeoutMinutes);
+      initializeTimeoutSummary();
+    }
+  }
+
   private class DisablePassphraseClickListener implements Preference.OnPreferenceChangeListener {
 
     @Override
diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
index dd982636dd..0df6c42094 100644
--- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -46,6 +46,8 @@ import org.thoughtcrime.securesms.util.ParcelUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.jobqueue.EncryptionKeys;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Small service that stays running to keep a key cached in memory.
  *
@@ -216,7 +218,7 @@ public class KeyCachingService extends Service {
 
     if ((activitiesRunning == 0) && (this.masterSecret != null) && timeoutEnabled && !TextSecurePreferences.isPasswordDisabled(this)) {
       long timeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(this);
-      long timeoutMillis  = timeoutMinutes * 60 * 1000;
+      long timeoutMillis  = TimeUnit.MINUTES.toMillis(timeoutMinutes);
 
       Log.w("KeyCachingService", "Starting timeout: " + timeoutMillis);
 
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 63ce32a658..f5701e4b98 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -33,7 +33,7 @@ public class TextSecurePreferences {
   private static final String LED_BLINK_PREF_CUSTOM            = "pref_led_blink_custom";
   public  static final String ALL_MMS_PREF                     = "pref_all_mms";
   public  static final String ALL_SMS_PREF                     = "pref_all_sms";
-  private static final String PASSPHRASE_TIMEOUT_INTERVAL_PREF = "pref_timeout_interval";
+  public  static final String PASSPHRASE_TIMEOUT_INTERVAL_PREF = "pref_timeout_interval";
   private static final String PASSPHRASE_TIMEOUT_PREF          = "pref_timeout_passphrase";
   private static final String AUTO_KEY_EXCHANGE_PREF           = "pref_auto_complete_key_exchange";
   public  static final String SCREEN_SECURITY_PREF             = "pref_screen_security";