diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 95bf59b470..8fc226c31a 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -90,6 +90,11 @@ module.exports = React.createClass({
         this.closeMenu();
     },
 
+    onResendEditClick: function() {
+        Resend.resend(this.props.mxEvent.replacingEvent());
+        this.closeMenu();
+    },
+
     e2eInfoClicked: function() {
         this.props.e2eInfoCallback();
         this.closeMenu();
@@ -220,6 +225,8 @@ module.exports = React.createClass({
     render: function() {
         const mxEvent = this.props.mxEvent;
         const eventStatus = mxEvent.status;
+        const editEvent = mxEvent.replacingEvent();
+        const editStatus = editEvent && editEvent.status;
         let resendButton;
         let redactButton;
         let cancelButton;
@@ -242,6 +249,14 @@ module.exports = React.createClass({
             );
         }
 
+        if (editStatus === EventStatus.NOT_SENT) {
+            resendButton = (
+                <div className="mx_MessageContextMenu_field" onClick={this.onResendEditClick}>
+                    { _t('Resend edit') }
+                </div>
+            );
+        }
+
         if (isSent && this.state.canRedact) {
             redactButton = (
                 <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 769316cd3b..912648b0c9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1302,6 +1302,7 @@
     "Unable to reject invite": "Unable to reject invite",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "Resend": "Resend",
+    "Resend edit": "Resend edit",
     "Cancel Sending": "Cancel Sending",
     "Forward Message": "Forward Message",
     "Pin Message": "Pin Message",