diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index fd035495ea..7e8c278c4c 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -310,6 +310,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
             if ("accounts".equals(target) && id > 0)
                 onEditAccount(intent);
+            else if ("identities".equals(target) && id > 0)
+                onEditIdentity(intent);
             else {
                 FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
                 if ("accounts".equals(target))
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 45a6418000..eb74f2e68f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -355,6 +355,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvNotes;
         private TextView tvError;
         private ImageButton ibHelp;
+        private ImageButton ibSettings;
 
         private View vsBody;
 
@@ -660,6 +661,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ivThread = itemView.findViewById(R.id.ivThread);
             tvError = itemView.findViewById(R.id.tvError);
             ibHelp = itemView.findViewById(R.id.ibHelp);
+            ibSettings = itemView.findViewById(R.id.ibSettings);
 
             if (tvFrom != null) {
                 if (compact) {
@@ -893,6 +895,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvFolder.setOnLongClickListener(this);
             }
             ibHelp.setOnClickListener(this);
+            ibSettings.setOnClickListener(this);
 
             if (vsBody != null) {
                 ibExpanderAddress.setOnClickListener(this);
@@ -989,6 +992,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvFolder.setOnLongClickListener(null);
             }
             ibHelp.setOnClickListener(null);
+            ibSettings.setOnClickListener(null);
 
             if (vsBody != null) {
                 ibExpanderAddress.setOnClickListener(null);
@@ -1378,6 +1382,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvError.setText(error);
                 tvError.setVisibility(error == null ? View.GONE : View.VISIBLE);
                 ibHelp.setVisibility(error == null ? View.GONE : View.VISIBLE);
+                ibSettings.setVisibility(
+                        error != null && EntityFolder.OUTBOX.equals(message.folderType)
+                                ? View.VISIBLE : View.GONE);
             }
 
             // Contact info
@@ -3349,6 +3356,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 onToggleFlag(message);
             else if (view.getId() == R.id.ibHelp)
                 onHelp(message);
+            else if (view.getId() == R.id.ibSettings)
+                onSettings(message);
             else if (view.getId() == R.id.ibReceipt)
                 onReceipt(message);
             else if (view.getId() == R.id.ibSearchContact)
@@ -3831,6 +3840,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             Helper.viewFAQ(context, 130);
         }
 
+        private void onSettings(TupleMessageEx message) {
+            context.startActivity(new Intent(context, ActivitySetup.class)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                    .putExtra("target", "identities")
+                    .putExtra("id", message.identity));
+        }
+
         private void onReceipt(TupleMessageEx message) {
             Intent reply = new Intent(context, ActivityCompose.class)
                     .putExtra("action", "dsn")
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 4367580de4..3516d7c789 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -409,6 +409,18 @@
         app:srcCompat="@drawable/twotone_info_24"
         app:tint="?attr/colorWarning" />
 
+    <ImageButton
+        android:id="@+id/ibSettings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintTop_toBottomOf="@id/ibHelp"
+        app:srcCompat="@drawable/twotone_settings_24"
+        app:tint="?attr/colorWarning" />
+
     <View
         android:id="@+id/paddingEnd"
         android:layout_width="6dp"
@@ -425,5 +437,5 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvError" />
+        app:layout_constraintTop_toBottomOf="@id/ibSettings" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 013b43afce..202bcf4684 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -409,6 +409,18 @@
         app:srcCompat="@drawable/twotone_info_24"
         app:tint="?attr/colorWarning" />
 
+    <ImageButton
+        android:id="@+id/ibSettings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="6dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
+        app:layout_constraintTop_toBottomOf="@id/ibHelp"
+        app:srcCompat="@drawable/twotone_settings_24"
+        app:tint="?attr/colorWarning" />
+
     <View
         android:id="@+id/paddingEnd"
         android:layout_width="6dp"
@@ -423,5 +435,5 @@
         android:layout_height="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvError" />
+        app:layout_constraintTop_toBottomOf="@id/ibSettings" />
 </androidx.constraintlayout.widget.ConstraintLayout>