diff --git a/rust/messages.py b/rust/messages.py
index 19c2a58a..65a30cbe 100644
--- a/rust/messages.py
+++ b/rust/messages.py
@@ -146,13 +146,13 @@ def _render_suggested_replacement(self):
         html_suggestion = html_suggestion\
             .replace(' ', ' ')\
             .replace('\n', '<br>\n')
-        return replacement_template % (
-            urllib.parse.urlencode({
-                'id': self.id,
-                'replacement': self.suggested_replacement,
-            }),
-            html_suggestion,
-        )
+        url_param = urllib.parse.urlencode({
+            'id': self.id,
+            'replacement': self.suggested_replacement,
+        })
+        if int(sublime.version()) > 4000:
+            url_param = url_param.replace('&', '&amp;')
+        return replacement_template % (url_param, html_suggestion)
 
     def suggestion_count(self):
         """Number of suggestions in this message.