Merge remote-tracking branch 'origin/develop' into develop

2017-05-30 14:01:24 +00:00 · 2017-05-30 14:01:24 +00:00 · d96c3656a6
commit d96c3656a6
parent a61b7af17a 8e1dea7bd1
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@ -161,7 +161,7 @@ module.exports = React.createClass({
            );
        }

-        if (this.state.canRedact) {
+        if (!eventStatus && this.state.canRedact) {
            redactButton = (
                <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
                    { _t('Remove') }