diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 82d7778a6e..f26180ab0b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5738,7 +5738,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             Uri uri = Uri.parse(etLink.getText().toString());
-                            Helper.view(context, uri, true);
+                            Helper.view(context, uri, true, true);
                         }
                     })
                     .setNegativeButton(android.R.string.cancel, null)
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 1344ff5795..12df6fb617 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -483,11 +483,17 @@ public class Helper {
     }
 
     static void view(Context context, Uri uri, boolean browse) {
+        view(context, uri, browse, false);
+    }
+
+    static void view(Context context, Uri uri, boolean browse, boolean task) {
         Log.i("View=" + uri);
 
         if (browse || !hasCustomTabs(context, uri)) {
             try {
                 Intent view = new Intent(Intent.ACTION_VIEW, uri);
+                if (task)
+                    view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(getChooser(context, view));
             } catch (Throwable ex) {
                 Log.e(ex);