diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
deleted file mode 100644
index 25ac33c5c..000000000
--- a/OpenKeychain/src/main/res/layout/settings_cache_ttl.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/settings_cache_select_three"/>
-
-    </LinearLayout>
-
-    <View style="@style/Divider"/>
-
-    <FrameLayout
-        android:id="@+id/settings_cache_ttl_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml b/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
deleted file mode 100644
index c0470288f..000000000
--- a/OpenKeychain/src/main/res/layout/settings_cache_ttl_item.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:background="?selectableItemBackground">
-
-    <CheckBox
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/ttl_selected"
-        android:layout_margin="8dp"
-        />
-
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:id="@+id/ttl_title"
-        android:layout_weight="1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textStyle="bold"
-        tools:text="One Hour"
-        />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/46000.txt b/fastlane/metadata/android/en-US/changelogs/46000.txt
new file mode 100644
index 000000000..038d2722a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/46000.txt
@@ -0,0 +1,2 @@
+4.6
+  * Import your keys using our new Secure Wi-Fi Transfer mechanism
diff --git a/fastlane/metadata/android/en-US/changelogs/47001.txt b/fastlane/metadata/android/en-US/changelogs/47001.txt
new file mode 100644
index 000000000..7de27b395
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/47001.txt
@@ -0,0 +1,4 @@
+4.7
+  * Improved import from clipboard
+  * New key creation wizard for Security Tokens
+  * Removed password cache "time to live" setting