diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index fe6c22ab1e..84474710cd 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -23,7 +23,7 @@ import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import { createMenu } from '../../structures/ContextualMenu';
 import SettingsStore from '../../../settings/SettingsStore';
-import { isContentActionable } from '../../../utils/EventUtils';
+import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
 
 export default class MessageActionBar extends React.PureComponent {
     static propTypes = {
@@ -148,12 +148,12 @@ export default class MessageActionBar extends React.PureComponent {
                 title={_t("Reply")}
                 onClick={this.onReplyClick}
             />;
-            if (this.isEditingEnabled()) {
-                editButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_editButton"
-                    title={_t("Edit")}
-                    onClick={this.onEditClick}
-                />;
-            }
+        }
+        if (this.isEditingEnabled() && canEditContent(this.props.mxEvent)) {
+            editButton = <span className="mx_MessageActionBar_maskButton mx_MessageActionBar_editButton"
+                title={_t("Edit")}
+                onClick={this.onEditClick}
+            />;
         }
 
         return <div className="mx_MessageActionBar">
diff --git a/src/utils/EventUtils.js b/src/utils/EventUtils.js
index 911257f95c..ac415ca6de 100644
--- a/src/utils/EventUtils.js
+++ b/src/utils/EventUtils.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { EventStatus } from 'matrix-js-sdk';
+import MatrixClientPeg from '../MatrixClientPeg';
 
 /**
  * Returns whether an event should allow actions like reply, reactions, edit, etc.
@@ -43,3 +44,8 @@ export function isContentActionable(mxEvent) {
 
     return false;
 }
+
+export function canEditContent(mxEvent) {
+    return isContentActionable(mxEvent) &&
+        mxEvent.getSender() === MatrixClientPeg.get().getUserId();
+}