diff --git a/frappe/desk/page/messages/messages.js b/frappe/desk/page/messages/messages.js
index 5d5a2911dd..897f193b31 100644
--- a/frappe/desk/page/messages/messages.js
+++ b/frappe/desk/page/messages/messages.js
@@ -46,7 +46,7 @@ frappe.desk.pages.Messages = Class.extend({
 			if(comment.modified_by !== user) {
 	    		frappe.utils.notify(__("Message from {0}", [comment.comment_by_fullname]), comment.comment);
 			}
-    		if (frappe.get_route()[0] === 'messages') {
+    		if (frappe.get_route()[0] === 'messages' && comment.owner !== user) {
     			var current_contact = $(cur_page.page).find('[data-contact]').data('contact');
     			var on_broadcast_page = current_contact === user;
     			if ((current_contact == comment.owner) || (on_broadcast_page && comment.broadcast)) {
@@ -101,7 +101,7 @@ frappe.desk.pages.Messages = Class.extend({
 
 		this.page.main.html($(frappe.render_template("messages_main", { "contact": contact })));
 
-		this.page.main.find(".messages-textarea").on("focusout", function() {
+		var text_area = this.page.main.find(".messages-textarea").on("focusout", function() {
 			// on touchscreen devices, scroll to top
 			// so that static navbar and page head don't overlap the textarea
 			if (frappe.dom.is_touchscreen()) {
@@ -109,7 +109,7 @@ frappe.desk.pages.Messages = Class.extend({
 			}
 		});
 
-		this.page.main.find(".btn-post").on("click", function() {
+		var post_btn = this.page.main.find(".btn-post").on("click", function() {
 			var btn = $(this);
 			var message_box = btn.parents(".message-box");
 			var textarea = message_box.find("textarea");
@@ -138,6 +138,10 @@ frappe.desk.pages.Messages = Class.extend({
 			}
 		});
 
+		text_area.keydown("meta+return ctrl+return", function(e) {
+			post_btn.trigger("click");
+		});
+
 		this.page.wrapper.find(".page-head .message-to").html(frappe.user.full_name(contact));
 
 		this.make_message_list(contact);
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index dc70a410da..1c78149f16 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -28,6 +28,10 @@ frappe.ui.form.Comments = Class.extend({
 				}
 			});
 
+		this.input.keydown("meta+return ctrl+return", function(e) {
+			me.button.trigger("click");
+		});
+
 		this.email_check = this.wrapper.find(".timeline-head input[type='checkbox']")
 			.on("change", function() {
 				me.button.html($(this).prop("checked") ? __("Compose") : __("Comment"));