diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 2f2785137f..762f1efe21 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1946,7 +1946,10 @@ public class HtmlHelper {
                 result.put(key, baseParams.get(key));
         }
 
-        return TextUtils.join(";", result.values());
+        if (result.size() == 0)
+            return "";
+
+        return TextUtils.join(";", result.values()) + ";";
     }
 
     private static Integer getFontWeight(String value) {