diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 3763403f7..f115bad59 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -385,7 +385,6 @@ public class ConversationActivity extends BriarActivity
 		// show auto-delete timer setting only, if contacts supports it
 		observeOnce(viewModel.getPrivateMessageFormat(), this, format -> {
 			boolean visible = format == TEXT_IMAGES_AUTO_DELETE;
-			menu.findItem(R.id.action_auto_delete).setVisible(visible);
 			menu.findItem(R.id.action_conversation_settings)
 					.setVisible(visible);
 		});
@@ -410,11 +409,6 @@ public class ConversationActivity extends BriarActivity
 				AliasDialogFragment.newInstance().show(
 						getSupportFragmentManager(), AliasDialogFragment.TAG);
 				return true;
-			case R.id.action_auto_delete:
-				boolean enabled = !item.isChecked();
-				viewModel.setAutoDeleteTimerEnabled(enabled);
-				item.setChecked(enabled);
-				return true;
 			case R.id.action_conversation_settings:
 				if (contactId == null) return false;
 				intent = new Intent(this, ConversationSettingsActivity.class);
diff --git a/briar-android/src/main/res/layout/conversation_settings_disappearing_messages_explanation.xml b/briar-android/src/main/res/layout/conversation_settings_disappearing_messages_explanation.xml
index fa2c34343..217906249 100644
--- a/briar-android/src/main/res/layout/conversation_settings_disappearing_messages_explanation.xml
+++ b/briar-android/src/main/res/layout/conversation_settings_disappearing_messages_explanation.xml
@@ -39,7 +39,7 @@
 		android:id="@+id/textViewExplanation"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:text="@string/disappearing_messages_explanation"
+		android:text="@string/disappearing_messages_explanation_short"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/barrier" />
diff --git a/briar-android/src/main/res/menu/conversation_actions.xml b/briar-android/src/main/res/menu/conversation_actions.xml
index 6f186342c..f3d057b08 100644
--- a/briar-android/src/main/res/menu/conversation_actions.xml
+++ b/briar-android/src/main/res/menu/conversation_actions.xml
@@ -16,17 +16,9 @@
 		android:title="@string/set_contact_alias"
 		app:showAsAction="never" />
 
-	<item
-		android:id="@+id/action_auto_delete"
-		android:checkable="true"
-		android:title="@string/menu_item_auto_delete"
-		android:visible="false"
-		app:showAsAction="never"
-		tools:visible="true" />
-
 	<item
 		android:id="@+id/action_conversation_settings"
-		android:title="@string/menu_item_conversation_settings"
+		android:title="@string/menu_item_disappearing_messages"
 		android:visible="false"
 		app:showAsAction="never"
 		tools:visible="true" />
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 1bbb7810b..bcf7f35f3 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -165,8 +165,7 @@
 	<string name="set_contact_alias">Change contact name</string>
 	<string name="set_contact_alias_hint">Contact name</string>
 	<string name="set_alias_button">Change</string>
-	<string name="menu_item_auto_delete">Disappearing messages</string>
-	<string name="menu_item_conversation_settings">Conversation settings</string>
+	<string name="menu_item_disappearing_messages">Disappearing messages</string>
 	<string name="delete_all_messages">Delete all messages</string>
 	<string name="dialog_title_delete_all_messages">Confirm Message Deletion</string>
 	<string name="dialog_message_delete_all_messages">Are you sure that you want to delete all messages?</string>
@@ -548,8 +547,11 @@
 	<string name="cannot_load_ringtone">Cannot load ringtone</string>
 
 	<!-- Conversation Settings -->
+	<string name="disappearing_messages_title">Disappearing messages</string>
 	<string name="disappearing_messages_cat_title">Self-destructing messages</string>
-	<string name="disappearing_messages_explanation">You can configure disappearing messages here.
+	<string name="disappearing_messages_explanation_short">You can configure disappearing messages here.
+		Turning on this setting will make new messages to this conversation automatically disappear 7 days after being received.</string>
+	<string name="disappearing_messages_explanation_long">You can configure disappearing messages here.
 		Turning on this setting will make new messages to this conversation automatically disappear 7 days after being received.
 		This applies to messages you send to your contact as well as messages your contact sends to you.
 		Your contact can also change this setting for the both of you.
@@ -558,7 +560,6 @@
 		If you change this setting, it will apply to your messages immediately and to messages of
 		your contact once they receive any message from you after changing the setting.</string>
 	<string name="learn_more">Learn more</string>
-	<string name="disappearing_messages_title">Disappearing messages</string>
 	<string name="disappearing_messages_summary">Make future messages in this conversation automatically disappear 7\u00A0days after being received.</string>
 
 	<!-- Settings Feedback -->
diff --git a/briar-android/src/main/res/xml/conversation_settings.xml b/briar-android/src/main/res/xml/conversation_settings.xml
index 59e6c800f..e59423973 100644
--- a/briar-android/src/main/res/xml/conversation_settings.xml
+++ b/briar-android/src/main/res/xml/conversation_settings.xml
@@ -2,25 +2,18 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-	<PreferenceCategory
-		android:layout="@layout/preferences_category"
-		android:title="@string/disappearing_messages_cat_title">
+	<Preference
+		android:key="pref_key_disappearing_messages_explanation"
+		android:layout="@layout/conversation_settings_disappearing_messages_explanation"
+		android:selectable="false" />
 
-		<Preference
-			android:key="pref_key_disappearing_messages_explanation"
-			android:layout="@layout/conversation_settings_disappearing_messages_explanation"
-			android:selectable="false" />
+	<org.briarproject.briar.android.conversation.LinkPreference android:key="pref_key_disappearing_messages_learn_more" />
 
-		<org.briarproject.briar.android.conversation.LinkPreference
-			android:key="pref_key_disappearing_messages_learn_more"/>
-
-		<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>
+	<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" />
 
 </PreferenceScreen>