diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 2df0e7d998..73dec812be 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -394,6 +394,9 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_channel, order++, R.string.title_edit_channel);
             }
 
+            if (settings)
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_properties, order++, R.string.title_edit_properties);
+
             if (account.protocol == EntityAccount.TYPE_IMAP && settings)
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, order++, R.string.title_copy);
 
@@ -419,6 +422,9 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                     } else if (itemId == R.string.title_edit_channel) {
                         onActionEditChannel();
                         return true;
+                    } else if (itemId == R.string.title_edit_properties) {
+                        ViewHolder.this.onClick(view);
+                        return true;
                     } else if (itemId == R.string.title_copy) {
                         onActionCopy();
                         return true;
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 3da7af1ecc..947db3a8fd 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -223,6 +223,8 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
             if (identity.sign_key != null || identity.sign_key_alias != null)
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_reset_sign_key, order++, R.string.title_reset_sign_key);
 
+            popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_properties, order++, R.string.title_edit_properties);
+
             popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, order++, R.string.title_copy);
             popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, order++, R.string.title_delete);
 
@@ -239,6 +241,9 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                     } else if (itemId == R.string.title_reset_sign_key) {
                         onActionClearSignKey();
                         return true;
+                    } else if (itemId == R.string.title_edit_properties) {
+                        onClick(view);
+                        return true;
                     } else if (itemId == R.string.title_copy) {
                         onActionCopy();
                         return true;