diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index f8bab0d1a6..3dcdf00a8e 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -252,12 +252,17 @@ def get_formatted_html(subject, message, footer=None, print_html=None,
 	if not email_account:
 		email_account = get_outgoing_email_account(False, sender=sender)
 
+	signature = None
+	if "<!-- signature-included -->" not in message:
+		signature = get_signature(email_account)
+
 	rendered_email = frappe.get_template("templates/emails/standard.html").render({
 		"brand_logo": get_brand_logo(email_account) if with_container or header else None,
 		"with_container": with_container,
 		"site_url": get_url(),
 		"header": get_header(header),
 		"content": message,
+		"signature": signature,
 		"footer": get_footer(email_account, footer),
 		"title": subject,
 		"print_html": print_html,
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index a5f078fc7d..430024a1d0 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -718,7 +718,7 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		if (!signature) {
 			const res = await this.get_default_outgoing_email_account_signature();
-			signature = res.message.signature;
+			signature = "<!-- signature-included -->" + res.message.signature;
 		}
 
 		if (signature && !frappe.utils.is_html(signature)) {