diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js
index ea55a71380..18cf002ed1 100644
--- a/static/js/feature_flags.js
+++ b/static/js/feature_flags.js
@@ -25,6 +25,7 @@ exports.log_send_times = false;
 exports.collect_send_times = false;
 
 // Permanent realm-specific stuff:
+exports.disable_message_editing = _.contains(['mit.edu'], page_params.domain);
 
 exports.twenty_four_hour_time = internal_24_hour_people || iceland;
 
diff --git a/static/js/popovers.js b/static/js/popovers.js
index cdd87b723b..ac5223afca 100644
--- a/static/js/popovers.js
+++ b/static/js/popovers.js
@@ -23,10 +23,8 @@ function show_message_info_popover(element, id) {
                                      elt.closest(".message_row").find(".message_time"));
 
         var message = current_msg_list.get(id);
-        var can_edit = message.sent_by_me;
         var args = {
             message:  message,
-            can_edit_message: can_edit,
             pm_with_uri: narrow.pm_with_uri(message.sender_email),
             sent_by_uri: narrow.by_sender_uri(message.sender_email),
             narrowed: narrow.active()
@@ -58,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;
+        var can_edit = message.sent_by_me && !feature_flags.disable_message_editing;
         var can_mute_topic =
                 message.stream &&
                 message.subject &&
diff --git a/static/js/ui.js b/static/js/ui.js
index f2da3f6bdd..af17a78efd 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -260,7 +260,7 @@ function message_hover(message_row) {
     message = current_msg_list.get(rows.id(message_row));
     message_unhover();
     message_row.addClass('message_hovered');
-    if (message && message.sent_by_me && !message.status_message) {
+    if (message && message.sent_by_me && !message.status_message && !feature_flags.disable_message_editing) {
         message_row.find('.message_content').find('p:last').append(edit_content_button);
     }
     current_message_hover = message_row;
@@ -1582,6 +1582,10 @@ $(function () {
                .text("Bringing you to your latest messages…"));
     });
 
+    if (feature_flags.disable_message_editing) {
+        $("#edit-message-hotkey-help").hide();
+    }
+
     // Some MIT-specific customizations
     if (page_params.domain === 'mit.edu') {
         $("#user-list").hide();
diff --git a/static/js/zulip.js b/static/js/zulip.js
index 208517ff40..ca271ca207 100644
--- a/static/js/zulip.js
+++ b/static/js/zulip.js
@@ -552,6 +552,10 @@ function process_message_for_recent_subjects(message, remove_message) {
 function set_topic_edit_properties(message) {
     message.always_visible_topic_edit = false;
     message.on_hover_topic_edit = false;
+    if (feature_flags.disable_message_editing) {
+        return;
+    }
+
     // Messages with no topics should always have an edit icon visible
     // to encourage updating them. Admins can also edit any topic.
     if (message.subject === compose.empty_subject_placeholder()) {
diff --git a/templates/zerver/keyboard_shortcuts.html b/templates/zerver/keyboard_shortcuts.html
index a64120cf0a..b0e87854bf 100644
--- a/templates/zerver/keyboard_shortcuts.html
+++ b/templates/zerver/keyboard_shortcuts.html
@@ -103,7 +103,7 @@
         <td class="hotkey">i</td>
         <td class="definition">Open message actions menu</td>
       </tr>
-      <tr>
+      <tr id="edit-message-hotkey-help">
         <td class="hotkey">i then Enter</td>
         <td class="definition">Edit a message you sent</td>
       </tr>