diff --git a/www/form/inner.js b/www/form/inner.js
index f832caf7b..1a1ab6759 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3129,9 +3129,9 @@ define([
             var $responseMsg = $(responseMsg);
             var refreshResponse = function () {
                 $responseMsg.empty();
-                Messages.form_updateMsg = "Update response message"; // XXX 4.11.0
-                Messages.form_addMsg = "Add response message"; // XXX 4.11.0
-                Messages.form_responseMsg = "Add a message that will be displayed in the response page."; // XXX 4.11.0
+                Messages.form_updateMsg = "Update submit message"; // XXX 4.11.0
+                Messages.form_addMsg = "Add submit message"; // XXX 4.11.0
+                Messages.form_responseMsg = "Add a message that will be displayed after participants submit the form."; // XXX 4.11.0
                 var text = content.answers.msg ? Messages.form_updateMsg : Messages.form_addMsg;
                 var btn = h('button.btn.btn-secondary', text);
                 $(btn).click(function () {
@@ -3167,6 +3167,12 @@ define([
                         });
 
                         var buttons = [{
+                            className: 'cancel',
+                            name: Messages.cancel,
+                            onClick: function () {},
+                            keys: [27]
+                        },
+                        {
                             className: 'primary',
                             name: Messages.settings_save,
                             onClick: function () {
@@ -3179,11 +3185,6 @@ define([
                                 });
                             },
                             //keys: []
-                        }, {
-                            className: 'cancel',
-                            name: Messages.cancel,
-                            onClick: function () {},
-                            keys: [27]
                         }];
                         APP.responseModal = UI.dialog.customModal(div, { buttons: buttons });
                     } else {