diff --git a/mautrix_telegram/formatter/from_telegram.py b/mautrix_telegram/formatter/from_telegram.py
index 688cf85a..3e9992e4 100644
--- a/mautrix_telegram/formatter/from_telegram.py
+++ b/mautrix_telegram/formatter/from_telegram.py
@@ -92,7 +92,7 @@ async def _add_forward_header(source, text: str, html: Optional[str],
     text = "\n".join([f"> {line}" for line in text.split("\n")])
     text = f"Forwarded from {fwd_from_text}:\n{text}"
     html = (f"Forwarded message from {fwd_from_html}<br/>"
-            f"<blockquote data-tg-forward>{html}</blockquote>")
+            f"<tg-forward><blockquote>{html}</blockquote></tg-forward>")
     return text, html
 
 
@@ -155,7 +155,7 @@ async def _add_reply_header(source: u.User, text: str, html: str, evt: Message,
 
     r_keyword = "In reply to" if not is_edit else "Edit to"
     r_msg_link = f"<a href='https://matrix.to/#/{msg.mx_room}/{msg.mxid}'>{r_keyword}</a>"
-    html = (f"<blockquote data-mx-reply>{r_msg_link} {r_sender_link}\n{r_html_body}<!--end-mx-reply--></blockquote>"
+    html = (f"<mx-reply><blockquote>{r_msg_link} {r_sender_link}\n{r_html_body}</blockquote></mx-reply>"
             + (html or escape(text)))
 
     lines = r_text_body.strip().split("\n")
diff --git a/mautrix_telegram/formatter/util.py b/mautrix_telegram/formatter/util.py
index 0073de52..f464ffe5 100644
--- a/mautrix_telegram/formatter/util.py
+++ b/mautrix_telegram/formatter/util.py
@@ -45,9 +45,9 @@ def trim_reply_fallback_text(text: str) -> str:
     return "\n".join(lines)
 
 
-html_reply_fallback_regex = re.compile("^<blockquote data-mx-reply>"
+html_reply_fallback_regex = re.compile("^<mx-reply>"
                                        r"[\s\S]+?"
-                                       "<!--end-mx-reply--></blockquote>")
+                                       "</mx-reply>")
 
 
 def trim_reply_fallback_html(html: str) -> str: