diff --git a/extension/chrome/elements/compose-modules/compose-sender-module.ts b/extension/chrome/elements/compose-modules/compose-sender-module.ts
index 4bf9cc48d56..0c8c0282a32 100644
--- a/extension/chrome/elements/compose-modules/compose-sender-module.ts
+++ b/extension/chrome/elements/compose-modules/compose-sender-module.ts
@@ -82,7 +82,8 @@ export class ComposeSenderModule extends ViewModule<ComposeView> {
         htmlWithUpdatedFooter = inputHtml.replace(lastSignature, footer);
       }
     } else {
-      const signaturePattern = /--\s*<br\s*\/?>\s*[\s\S]*?(?=<br><br><blockquote dir="ltr">|On .* at .*, .*? wrote:|$)/;
+      const signaturePattern =
+        /--\s*<br\s*\/?>\s*[\s\S]*?(?=<br><\/div><div><br><\/div><div>|<br><br><blockquote dir="ltr"|On .* at .*, .*? wrote:|<br><\div><div><br><\div>|$)/;
       htmlWithUpdatedFooter = inputHtml.replace(signaturePattern, footer);
     }
     Xss.sanitizeRender(inputEl, htmlWithUpdatedFooter);