diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index bd37f98360..380d04d1db 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -131,8 +131,9 @@ module.exports = React.createClass({
 
     componentDidUpdate: function(prevProps) {
         if (!this.props.isEditing) {
+            const stoppedEditing = prevProps.isEditing && !this.props.isEditing;
             const messageWasEdited = prevProps.replacingEventId !== this.props.replacingEventId;
-            if (messageWasEdited) {
+            if (messageWasEdited || stoppedEditing) {
                 this._applyFormatting();
             }
             this.calculateUrlPreview();