diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 0821dcf69c..ee7f02cd6d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -241,6 +241,7 @@ 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_advanced_create_alias, order++, R.string.title_advanced_create_alias);
             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);
@@ -259,6 +260,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_advanced_create_alias) {
+                        onActionAlias();
+                        return true;
                     } else if (itemId == R.string.title_edit_properties) {
                         onClick(view);
                         return true;
@@ -368,6 +372,17 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                     }.execute(context, owner, args, "identitty:clear_sign_key");
                 }
 
+                private void onActionAlias() {
+                    Bundle args = new Bundle();
+                    args.putLong("id", identity.id);
+                    args.putString("name", identity.name);
+                    args.putString("email", identity.email);
+
+                    FragmentDialogAlias fragment = new FragmentDialogAlias();
+                    fragment.setArguments(args);
+                    fragment.show(parentFragment.getParentFragmentManager(), "alias:create");
+                }
+
                 private void onActionCopy() {
                     LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
                     lbm.sendBroadcast(
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogAlias.java b/app/src/main/java/eu/faircode/email/FragmentDialogAlias.java
new file mode 100644
index 0000000000..32c4f1cad2
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogAlias.java
@@ -0,0 +1,125 @@
+package eu.faircode.email;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2023 by Marcel Bokhorst (M66B)
+*/
+
+import static android.app.Activity.RESULT_OK;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+public class FragmentDialogAlias extends FragmentDialogBase {
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        final Context context = getContext();
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_alias, null);
+        final EditText etName = view.findViewById(R.id.etName);
+        final EditText etEmail = view.findViewById(R.id.etEmail);
+        final ImageButton ibInfo = view.findViewById(R.id.ibInfo);
+
+        Bundle args = getArguments();
+        etName.setText(args.getString("name"));
+        etEmail.setText(args.getString("email"));
+
+        etEmail.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId != EditorInfo.IME_ACTION_DONE)
+                    return false;
+                AlertDialog dialog = (AlertDialog) getDialog();
+                if (dialog == null)
+                    return false;
+                Button btnOk = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+                if (btnOk == null)
+                    return false;
+                btnOk.performClick();
+                return true;
+            }
+        });
+
+        ibInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 9);
+            }
+        });
+
+        return new AlertDialog.Builder(context)
+                .setView(view)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        args.putString("name", etName.getText().toString());
+                        args.putString("email", etEmail.getText().toString());
+
+                        new SimpleTask<EntityIdentity>() {
+                            @Override
+                            protected EntityIdentity onExecute(Context context, Bundle args) throws Throwable {
+                                long id = args.getLong("id");
+                                String name = args.getString("name");
+                                String email = args.getString("email");
+
+                                DB db = DB.getInstance(context);
+
+                                EntityIdentity identity = db.identity().getIdentity(id);
+                                if (identity == null)
+                                    return null;
+
+                                identity.id = null;
+                                identity.name = name;
+                                identity.email = email;
+                                identity.primary = false;
+                                identity.sign_key = null;
+                                identity.sign_key_alias = null;
+                                identity.error = null;
+                                identity.last_connected = null;
+                                identity.id = db.identity().insertIdentity(identity);
+
+                                return identity;
+                            }
+
+                            @Override
+                            protected void onException(Bundle args, Throwable ex) {
+                                Log.unexpectedError(getParentFragmentManager(), ex);
+                            }
+                        }.execute(FragmentDialogAlias.this, args, "create:alias");
+
+                        sendResult(RESULT_OK);
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+    }
+}
diff --git a/app/src/main/res/layout/dialog_alias.xml b/app/src/main/res/layout/dialog_alias.xml
new file mode 100644
index 0000000000..0cd9259895
--- /dev/null
+++ b/app/src/main/res/layout/dialog_alias.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="24dp"
+    android:scrollbarStyle="outsideOverlay">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tvName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_person_24"
+            android:drawablePadding="6dp"
+            android:labelFor="@+id/etName"
+            android:text="@string/title_advanced_create_alias"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <eu.faircode.email.EditTextPlain
+            android:id="@+id/etName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:inputType="textPersonName|textCapWords"
+            android:text="Name"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvName" />
+
+        <eu.faircode.email.EditTextPlain
+            android:id="@+id/etEmail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:imeOptions="actionDone"
+            android:inputType="textEmailAddress"
+            android:text="Email"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etName" />
+
+        <ImageButton
+            android:id="@+id/ibInfo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:contentDescription="@string/title_info"
+            android:tooltipText="@string/title_info"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etEmail"
+            app:srcCompat="@drawable/twotone_info_24" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ae1c9681f..fe86634776 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1063,6 +1063,7 @@
 
     <string name="title_advanced_never_favorite">Never favorite</string>
     <string name="title_advanced_edit_name">Edit name</string>
+    <string name="title_advanced_create_alias">Create alias</string>
 
     <string name="title_create_folder">Create folder</string>
     <string name="title_create_folder_name">Folder name</string>