diff --git a/res/xml/apg_preferences.xml b/res/xml/apg_preferences.xml
index faa5f9e3f..5527cda1a 100644
--- a/res/xml/apg_preferences.xml
+++ b/res/xml/apg_preferences.xml
@@ -27,7 +27,7 @@
             android:entryValues="@array/language_values"
             android:dialogTitle="@string/label_language" />
 
-        <org.thialfihar.android.apg.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:persistent="false"
             android:key="passPhraseCacheTtl"
             android:entries="@array/pass_phrase_cache_ttl_entries"
@@ -44,22 +44,22 @@
     <PreferenceCategory
         android:title="@string/section_defaults">
 
-        <org.thialfihar.android.apg.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:persistent="false"
             android:key="defaultEncryptionAlgorithm"
             android:title="@string/label_encryptionAlgorithm" />
 
-        <org.thialfihar.android.apg.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:persistent="false"
             android:key="defaultHashAlgorithm"
             android:title="@string/label_hashAlgorithm" />
 
-        <org.thialfihar.android.apg.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:persistent="false"
             android:key="defaultMessageCompression"
             android:title="@string/label_messageCompression" />
 
-        <org.thialfihar.android.apg.IntegerListPreference
+        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
             android:persistent="false"
             android:key="defaultFileCompression"
             android:title="@string/label_fileCompression" />
diff --git a/src/org/thialfihar/android/apg/PreferencesActivity.java b/src/org/thialfihar/android/apg/PreferencesActivity.java
index f50b9f05c..0d0d76318 100644
--- a/src/org/thialfihar/android/apg/PreferencesActivity.java
+++ b/src/org/thialfihar/android/apg/PreferencesActivity.java
@@ -22,6 +22,7 @@ import java.util.Vector;
 
 import org.bouncycastle2.bcpg.HashAlgorithmTags;
 import org.bouncycastle2.openpgp.PGPEncryptedData;
+import org.thialfihar.android.apg.ui.widget.IntegerListPreference;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/org/thialfihar/android/apg/IntegerListPreference.java b/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
similarity index 98%
rename from src/org/thialfihar/android/apg/IntegerListPreference.java
rename to src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
index 0c5a643ef..1d5f9e3d7 100644
--- a/src/org/thialfihar/android/apg/IntegerListPreference.java
+++ b/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.thialfihar.android.apg;
+package org.thialfihar.android.apg.ui.widget;
 
 import android.content.Context;
 import android.preference.ListPreference;