diff --git a/internal_packages/composer/lib/composer-editor.jsx b/internal_packages/composer/lib/composer-editor.jsx
index d8df71602..d8d70d0be 100644
--- a/internal_packages/composer/lib/composer-editor.jsx
+++ b/internal_packages/composer/lib/composer-editor.jsx
@@ -128,7 +128,7 @@ class ComposerEditor extends Component {
     // quoted text that is visible. (as in forwarded messages.)
     //
     this.refs.contenteditable.atomicEdit( ({editor})=> {
-      const walker = document.createTreeWalker(editor.rootNode, NodeFilter.SHOW_TEXT);
+      const walker = document.createTreeWalker(editor.rootNode, NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT);
       const nodesBelowUserBody = editor.rootNode.querySelectorAll('.nylas-n1-signature, .gmail_quote, blockquote');
 
       let lastNode = null;