diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 01aa86a75..ef2c7ed97 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -944,6 +944,7 @@ class ComposePopupView extends AbstractViewNext {
 						'EMAIL': sFrom
 					});
 
+					sText = sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '');
 					sText = '<br /><br />' + sReplyTitle + ':' + '<br /><br />' + '<blockquote>' + sText.trim() + '</blockquote>';
 
 					break;