diff --git a/WHATSNEW.md b/WHATSNEW.md
index 5d204610..f1eed328 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -7,6 +7,7 @@ This document attempts to track **major** changes and additions in ENiGMA½. For
 * A full configuration revamp has taken place. Configuration files such as `config.hjson`, `menu.hjson`, and `theme.hjson` can now utilize includes via the `includes` directive, reference 'self' sections using `@reference:` and import environment variables with `@environment`.
 * An explicit prompt file previously specified by `general.promptFile` in `config.hjson` is no longer necessary. Instead, this now simply part of the `prompts` section in `menu.hjson`. The default setup still creates a separate prompt HJSON file, but it is `includes`ed in `menu.hjson`.
 * New `PV` ACS check for arbitrary user properties. See [ACS](/docs/configuration/acs.md) for details.
+* The `message` arg used by `msg_list` has been deprecated. Please starting using `messageIndex` for this purpose. Support for `message` will be removed in the future.
 
 ## 0.0.11-beta
 * Upgraded from `alpha` to `beta` -- The software is far along and mature enough at this point!
diff --git a/misc/menu_templates/login.in.hjson b/misc/menu_templates/login.in.hjson
index bcee88e2..d16ace0c 100644
--- a/misc/menu_templates/login.in.hjson
+++ b/misc/menu_templates/login.in.hjson
@@ -372,7 +372,7 @@
                         VM1: {
                             focus: true
                             submit: true
-                            argName: message
+                            argName: messageIndex
                         }
                         TL6: { }
                     }
diff --git a/misc/menu_templates/message_base.in.hjson b/misc/menu_templates/message_base.in.hjson
index a7bcac65..e5bfb822 100644
--- a/misc/menu_templates/message_base.in.hjson
+++ b/misc/menu_templates/message_base.in.hjson
@@ -245,7 +245,7 @@
                         VM1: {
                             focus: true
                             submit: true
-                            argName: message
+                            argName: messageIndex
                         }
                     }
                     submit: {
@@ -372,7 +372,7 @@
                         VM1: {
                             focus: true
                             submit: true
-                            argName: message
+                            argName: messageIndex
                         }
                         TL6: {
                             //  theme me!
@@ -421,7 +421,7 @@
                         VM1: {
                             focus: true
                             submit: true
-                            argName: message
+                            argName: messageIndex
                         }
                     }
                     submit: {
diff --git a/misc/menu_templates/private_mail.in.hjson b/misc/menu_templates/private_mail.in.hjson
index eeefb25d..0ebd2fa9 100644
--- a/misc/menu_templates/private_mail.in.hjson
+++ b/misc/menu_templates/private_mail.in.hjson
@@ -145,7 +145,7 @@
             module: msg_list
             art: PRVMSGLIST
             config: {
-                menuViewPost: messageAreaViewPost
+                menuViewPost: messageBaseViewPost
                 messageAreaTag: private_mail
             }
             form: {
@@ -154,7 +154,7 @@
                         VM1: {
                             focus: true
                             submit: true
-                            argName: message
+                            argName: messageIndex
                         }
                     }
                     submit: {