From 34722de1daf96111a27991ee76f3a34c6ef2b950 Mon Sep 17 00:00:00 2001
From: Leo Franchi <leo@zulip.com>
Date: Thu, 2 Jan 2014 12:55:44 -0600
Subject: [PATCH] Don't allow editing of in-flight locally delivered messages

(imported from commit 771ba4910a8f8e50803baa5f7ec75208077ed2dd)
---
 static/js/popovers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/popovers.js b/static/js/popovers.js
index d88f6523ee..a3aa07a13f 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -56,7 +56,7 @@ exports.toggle_actions_popover = function (element, id) {
     var elt = $(element);
     if (elt.data('popover') === undefined) {
         var message = current_msg_list.get(id);
-        var can_edit = message.sent_by_me && !feature_flags.disable_message_editing;
+        var can_edit = message.sent_by_me && message.local_id === undefined && !feature_flags.disable_message_editing;
         var can_mute_topic =
                 message.stream &&
                 message.subject &&