diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index 7c436fce09..ea0c161972 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -356,6 +356,20 @@ public class UriHelper {
                     Log.i(ex);
                 }
 
+            if (result == null && !BuildConfig.PLAY_STORE_RELEASE) {
+                for (String key : uri.getQueryParameterNames()) {
+                    for (String value : uri.getQueryParameters(key)) {
+                        Uri q = Uri.parse(value);
+                        if (isHyperLink(q)) {
+                            result = q;
+                            break;
+                        }
+                    }
+                    if (result != null)
+                        break;
+                }
+            }
+
             changed = (result != null && isHyperLink(result));
             url = (changed ? result : uri);
         }