diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 66c8d3a85..6763eaae3 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -31,7 +31,7 @@ const
 	 * https://github.com/M66B/FairEmail/blob/master/app/src/main/java/eu/faircode/email/UriHelper.java
 	 */
 	// eslint-disable-next-line max-len
-	stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing|elq|bch|trc|ref|correlation_id)/i,
+	stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing|elq|bch|trc|ref|correlation_id|e$)/i,
 	urlGetParam = (url, name) => new URL(url).searchParams.get(name) || url,
 	base64Url = data => atob(data.replace(/_/g,'/').replace(/-/g,'+')),
 	stripTracking = url => {
@@ -325,7 +325,7 @@ export const
 					{
 						setAttribute('data-x-src', value);
 						result.hasExternals = true;
-						oElement.alt || (oElement.alt = value.replace(/^.+\/([^/]+)$/, '$1').slice(0, 32));
+						oElement.alt || (oElement.alt = value.replace(/^.+\/([^/?]+).*$/, '$1').slice(-20));
 					}
 					else if ('data:image/' === value.slice(0, 11))
 					{