diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index e7c4f61419..d87fe1b0f5 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -662,6 +662,13 @@ fieldset[disabled] .form-control {
   max-height: 300px;
   overflow: auto;
 }
+.modal .note-editor .note-btn-italic,
+.modal .note-editor .note-btn-underline,
+.modal .note-editor [data-original-title="Font Size"],
+.modal .note-editor [data-original-title="Video"],
+.modal .note-editor [data-original-title="Table"] {
+  display: none;
+}
 .search-dialog .modal-dialog {
   width: 768px;
   height: 500px;
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index 35c2641aad..ae16819ad5 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -1668,6 +1668,8 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 			}
 		});
 		this.note_editor = $(this.input_area).find('.note-editor');
+		// to fix <p> on enter
+		this.set_input('<div><br></div>');
 	},
 	hide_elements_on_mobile: function() {
 		this.note_editor.find('.note-btn-underline,\
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 46c6302e04..4f20bd2c98 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -530,7 +530,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			var last_email_content = last_email.original_comment || last_email.content;
 
 			fields.content.set_input(
-				'<p><br></p>'
+				'<div><br></div>'
 				+ reply
 				+ "<br><!-- original-reply --><br>"
 				+ '<blockquote>' +
@@ -539,7 +539,7 @@ frappe.views.CommunicationComposer = Class.extend({
 					last_email_content +
 				'<blockquote>');
 		} else {
-			fields.content.set_input(reply);
+			fields.content.set_input("<div><br></div>" + reply);
 		}
 	},
 	setup_awesomplete: function() {
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 7414ccb74e..029646f073 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -531,6 +531,17 @@ textarea.form-control {
 	}
 }
 
+// hide some buttons in modal
+.modal .note-editor {
+	.note-btn-italic,
+	.note-btn-underline,
+	[data-original-title="Font Size"],
+	[data-original-title="Video"],
+	[data-original-title="Table"] {
+		display: none;
+	}
+}
+
 .search-dialog {
 	.modal-dialog {
 		width: 768px;