diff --git a/core/msg_list.js b/core/msg_list.js
index 380fc5e4..73ab4850 100644
--- a/core/msg_list.js
+++ b/core/msg_list.js
@@ -60,13 +60,14 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
         this.menuMethods = {
             selectMessage : (formData, extraArgs, cb) => {
                 if(MciViewIds.allViews.msgList === formData.submitId) {
-                    this.initialFocusIndex = formData.value.message;
+                    this.initialFocusIndex = formData.value.messageIndex ||
+                        formData.value.message; //  older deprecated arg name
 
                     const modOpts = {
                         extraArgs   : {
-                            messageAreaTag      : this.getSelectedAreaTag(formData.value.message),
+                            messageAreaTag      : this.getSelectedAreaTag(this.initialFocusIndex),
                             messageList         : this.config.messageList,
-                            messageIndex        : formData.value.message,
+                            messageIndex        : this.initialFocusIndex,
                             lastMessageNextExit : true,
                         }
                     };
@@ -107,7 +108,8 @@ exports.getModule = class MessageListModule extends MessageAreaConfTempSwitcher(
                 if(MciViewIds.allViews.msgList != formData.submitId) {
                     return cb(null);
                 }
-                const messageIndex = _.get(formData, 'value.message');
+                const messageIndex = formData.value.messageIndex ||
+                    formData.value.message; //  older, deprecated arg name
                 return this.promptDeleteMessageConfirm(messageIndex, cb);
             },
             deleteMessageYes : (formData, extraArgs, cb) => {