diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index dc7a7052f8..40b92c45e8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -58,6 +58,7 @@ import android.provider.CalendarContract;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
 import android.provider.Settings;
+import android.text.Html;
 import android.text.Layout;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -5839,6 +5840,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             popupMenu.getMenu().findItem(R.id.menu_force_light).setChecked(force_light);
 
             popupMenu.getMenu().findItem(R.id.menu_share).setEnabled(message.content);
+            popupMenu.getMenu().findItem(R.id.menu_share_link).setVisible(BuildConfig.DEBUG);
             popupMenu.getMenu().findItem(R.id.menu_pin).setVisible(pin);
             popupMenu.getMenu().findItem(R.id.menu_event).setEnabled(message.content);
             popupMenu.getMenu().findItem(R.id.menu_print).setEnabled(hasWebView && message.content);
@@ -5946,6 +5948,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     } else if (itemId == R.id.menu_share) {
                         onMenuShare(message, false);
                         return true;
+                    } else if (itemId == R.id.menu_share_link) {
+                        onMenuShareLink(message);
+                        return true;
                     } else if (itemId == R.id.menu_pin) {
                         onMenuPin(message);
                         return true;
@@ -6809,6 +6814,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }.execute(context, owner, args, "message:share");
         }
 
+        private void onMenuShareLink(TupleMessageEx message) {
+            String link = message.getLink();
+            String title = context.getString(R.string.title_share_link_open);
+            String html = "<a href=\"" + link + "\">" + Html.escapeHtml(title) + "<a/>";
+
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_SEND);
+            intent.setType("text/plain");
+            intent.putExtra(Intent.EXTRA_TEXT, link);
+            intent.putExtra(Intent.EXTRA_HTML_TEXT, html);
+            context.startActivity(intent);
+        }
+
         private void onMenuPin(TupleMessageEx message) {
             View view = LayoutInflater.from(context).inflate(R.layout.dialog_shortcut_label, null);
             EditText etLabel = view.findViewById(R.id.etLabel);
diff --git a/app/src/main/java/eu/faircode/email/EntityMessage.java b/app/src/main/java/eu/faircode/email/EntityMessage.java
index e924318adc..23db7be301 100644
--- a/app/src/main/java/eu/faircode/email/EntityMessage.java
+++ b/app/src/main/java/eu/faircode/email/EntityMessage.java
@@ -269,6 +269,9 @@ public class EntityMessage implements Serializable {
     }
 
     String getLink() {
+        // adb shell pm set-app-links --package eu.faircode.email 0 all
+        // adb shell pm verify-app-links --re-verify eu.faircode.email
+        // adb shell pm get-app-links eu.faircode.email
         return "https://link.fairemail.net/#" + id;
     }
 
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index 5a2b7976cb..90456f7eba 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -104,6 +104,11 @@
             android:icon="@drawable/twotone_share_24"
             android:title="@string/title_share" />
 
+        <item
+            android:id="@+id/menu_share_link"
+            android:icon="@drawable/twotone_insert_link_45_24"
+            android:title="@string/title_share_link" />
+
         <item
             android:id="@+id/menu_pin"
             android:icon="@drawable/twotone_push_pin_24"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ee264ec35..3e20c45035 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1337,6 +1337,8 @@
     <string name="title_full_screen">Full screen</string>
     <string name="title_force_light">Force light theme</string>
     <string name="title_share">Share</string>
+    <string name="title_share_link" translatable="false">Share link</string>
+    <string name="title_share_link_open" translatable="false">Open message</string>
     <string name="title_zip" translatable="false">ZIP</string>
     <string name="title_event">Add to calendar</string>
     <string name="title_pin">Add shortcut</string>