diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 48ed8be3d..a8faf6ad0 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -548,10 +548,9 @@
 	<string name="cannot_load_ringtone">Cannot load ringtone</string>
 
 	<!-- Conversation Settings -->
-	<string name="disappearing_messages_title">Disappearing messages</string>
-	<string name="disappearing_messages_summary">Define a timeout after which messages self-destruct</string>
-	<string name="disappearing_messages_timeout_title">Self-destruct Timeout</string>
-	<string name="disappearing_messages_timeout_summary">7 days</string>
+	<string name="disappearing_messages_cat_title">Disappearing messages</string>
+	<string name="disappearing_messages_title">Let messages disappear automatically</string>
+	<string name="disappearing_messages_summary">Messages in this conversation will automatically disappear 7 days after being received. This applies both to messages you send to your contact as well as messages your contact sends to you.</string>
 
 	<!-- Settings Feedback -->
 	<string name="feedback_settings_title">Feedback</string>
diff --git a/briar-android/src/main/res/xml/conversation_settings.xml b/briar-android/src/main/res/xml/conversation_settings.xml
index 57bf58632..bd706d40f 100644
--- a/briar-android/src/main/res/xml/conversation_settings.xml
+++ b/briar-android/src/main/res/xml/conversation_settings.xml
@@ -2,11 +2,17 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-	<SwitchPreference
-		android:defaultValue="true"
-		android:key="pref_key_disappearing_messages"
-		android:summary="@string/disappearing_messages_summary"
-		android:title="@string/disappearing_messages_title"
-		app:iconSpaceReserved="false" />
+	<PreferenceCategory
+		android:layout="@layout/preferences_category"
+		android:title="@string/disappearing_messages_cat_title">
+
+		<SwitchPreference
+			android:defaultValue="true"
+			android:key="pref_key_disappearing_messages"
+			android:summary="@string/disappearing_messages_summary"
+			android:title="@string/disappearing_messages_title"
+			app:iconSpaceReserved="false" />
+
+	</PreferenceCategory>
 
 </PreferenceScreen>