diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index 0d64ca972..2a2f0b9de 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -440,10 +440,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
     menu.clear();
 
-    inflater.inflate(R.menu.conversation, menu);
+    getMenuInflater().inflate(R.menu.conversation, menu);
 
     if (dcChat.isSelfTalk() || dcChat.isBroadcast()) {
       menu.findItem(R.id.menu_mute_notifications).setVisible(false);
@@ -465,18 +464,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (isMultiUser()) {
       if (dcChat.canSend() && !dcChat.isBroadcast() && !dcChat.isMailingList()) {
-        inflater.inflate(R.menu.conversation_push_group_options, menu);
+        menu.findItem(R.id.menu_leave).setVisible(true);
       }
     }
 
-    inflater.inflate(R.menu.conversation_archive, menu);
     if (isArchived()) {
       menu.findItem(R.id.menu_archive_chat).setTitle(R.string.menu_unarchive_chat);
     }
 
-    inflater.inflate(R.menu.conversation_clear, menu);
-    inflater.inflate(R.menu.conversation_delete, menu);
-
     try {
       MenuItem searchItem = menu.findItem(R.id.menu_search_chat);
       searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml
index 76d34703f..923c86091 100644
--- a/src/main/res/menu/conversation.xml
+++ b/src/main/res/menu/conversation.xml
@@ -42,4 +42,17 @@
     <item android:title="@string/menu_add_attachment"
           android:id="@+id/menu_add_attachment" />
 
+    <item android:id="@+id/menu_leave"
+        android:visible="false"
+        android:title="@string/menu_leave_group"/>
+
+    <item android:title="@string/menu_archive_chat"
+        android:id="@+id/menu_archive_chat"/>
+
+    <item android:title="@string/clear_chat"
+        android:id="@+id/menu_clear_chat"/>
+
+    <item android:title="@string/menu_delete_chat"
+        android:id="@+id/menu_delete_chat"/>
+
 </menu>
diff --git a/src/main/res/menu/conversation_archive.xml b/src/main/res/menu/conversation_archive.xml
deleted file mode 100644
index 3d7c9fa92..000000000
--- a/src/main/res/menu/conversation_archive.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:title="@string/menu_archive_chat"
-          android:id="@+id/menu_archive_chat"/>
-
-</menu>
diff --git a/src/main/res/menu/conversation_clear.xml b/src/main/res/menu/conversation_clear.xml
deleted file mode 100644
index 16d780100..000000000
--- a/src/main/res/menu/conversation_clear.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:title="@string/clear_chat"
-          android:id="@+id/menu_clear_chat"/>
-
-</menu>
diff --git a/src/main/res/menu/conversation_delete.xml b/src/main/res/menu/conversation_delete.xml
deleted file mode 100644
index 861460de3..000000000
--- a/src/main/res/menu/conversation_delete.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:title="@string/menu_delete_chat"
-          android:id="@+id/menu_delete_chat"/>
-
-</menu>
diff --git a/src/main/res/menu/conversation_push_group_options.xml b/src/main/res/menu/conversation_push_group_options.xml
deleted file mode 100644
index bf6b086b7..000000000
--- a/src/main/res/menu/conversation_push_group_options.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/menu_leave"
-          android:title="@string/menu_leave_group"
-          app:showAsAction="collapseActionView"/>
-
-</menu>