diff --git a/app/src/main/res/menu/menu_accounts.xml b/app/src/main/res/menu/menu_accounts.xml
index 3a9d5188da..2f205f6c1a 100644
--- a/app/src/main/res/menu/menu_accounts.xml
+++ b/app/src/main/res/menu/menu_accounts.xml
@@ -42,9 +42,7 @@
-
-
-
+ app:showAsAction="never" />
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 8875fc983c..6b46418432 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -101,49 +101,37 @@
android:id="@+id/menu_contact_group"
android:icon="@drawable/twotone_group_add_24"
android:title="@string/title_insert_contact_group"
- app:showAsAction="never">
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
@@ -71,21 +69,15 @@
-
-
-
+ app:showAsAction="never" />
-
-
-
+ android:title="@string/title_edit_account_name" />
-
-
-
+ android:title="@string/title_edit_account_color" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ android:title="@string/title_select_language" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
-
-
-
+ app:showAsAction="never" />
diff --git a/app/src/main/res/menu/popup_reply.xml b/app/src/main/res/menu/popup_reply.xml
index 0732f7178f..596ef1fafa 100644
--- a/app/src/main/res/menu/popup_reply.xml
+++ b/app/src/main/res/menu/popup_reply.xml
@@ -60,21 +60,15 @@
-
-
-
+ android:title="@string/title_reply_template" />
-
-
-
+ android:title="@string/title_move_to" />
-
-
-
+ android:title="@string/menu_setup" />
\ No newline at end of file