diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index b498160c1e..8d5a83e920 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -765,8 +765,6 @@ public class FragmentCompose extends FragmentBase {
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
-        menu.findItem(R.id.menu_addresses).setVisible(false);
-        //menu.findItem(R.id.menu_addresses).setVisible(working >= 0);
         menu.findItem(R.id.menu_zoom).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_media_toolbar).setVisible(state == State.LOADED);
         menu.findItem(R.id.menu_clear).setVisible(state == State.LOADED);
@@ -799,9 +797,6 @@ public class FragmentCompose extends FragmentBase {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
                     handleExit();
                 return true;
-            case R.id.menu_addresses:
-                onMenuAddresses();
-                return true;
             case R.id.menu_zoom:
                 onMenuZoom();
                 return true;
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index b1478082e8..0153f355bb 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -148,7 +148,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
-                android:contentDescription="@string/title_legend_pick"
+                android:contentDescription="@string/title_show_addresses"
                 android:src="@drawable/baseline_people_24"
                 app:layout_constraintBottom_toBottomOf="@id/etSubject"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index a1af44c221..7a454d1d69 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -1,12 +1,6 @@
 <?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_addresses"
-        android:icon="@drawable/baseline_people_24"
-        android:title="@string/title_show_addresses"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/menu_zoom"
         android:icon="@drawable/baseline_format_size_24"