diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 58e94ee763..c7f687e915 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5708,8 +5708,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     !TextUtils.isEmpty(uri.getQueryParameter("url"))) {
                 changed = true;
                 url = Uri.parse(uri.getQueryParameter("url"));
-                if (url.isOpaque())
-                    return uri;
             } else if ("https".equals(uri.getScheme()) &&
                     "www.google.com".equals(uri.getHost()) &&
                     uri.getPath() != null &&
@@ -5737,6 +5735,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             } else
                 url = uri;
 
+            if (url.isOpaque())
+                return uri;
+
             builder = url.buildUpon();
 
             builder.clearQuery();