diff --git a/config/sort2.h b/config/sort2.h
index e10e8bb5863..e744bc09797 100644
--- a/config/sort2.h
+++ b/config/sort2.h
@@ -28,7 +28,6 @@
 struct ConfigSet;
 
 extern const struct Mapping SortAliasMethods[];
-extern const struct Mapping SortAuxMethods[];
 extern const struct Mapping SortBrowserMethods[];
 extern const struct Mapping SortKeyMethods[];
 extern const struct Mapping SortMethods[];
diff --git a/docs/config.c b/docs/config.c
index 12709fc5323..573f57cc874 100644
--- a/docs/config.c
+++ b/docs/config.c
@@ -4126,18 +4126,18 @@
 ** Specifies how to sort mailbox entries in the sidebar.  By default, the
 ** entries are sorted alphabetically.  Valid values:
 ** .il
-** .dd alpha (alphabetically)
+** .dd path (alphabetically)
 ** .dd count (all message count)
 ** .dd flagged (flagged message count)
-** .dd name (alphabetically)
 ** .dd new (unread message count)
-** .dd path (alphabetically)
 ** .dd unread (unread message count)
 ** .dd unsorted
 ** .ie
 ** .pp
 ** You may optionally use the "reverse-" prefix to specify reverse sorting
 ** order (example: "\fCset sidebar_sort_method=reverse-alpha\fP").
+** .pp
+** The "alpha" and "name" values are synonyms for "path".
 */
 
 { "sidebar_visible", DT_BOOL, false },
@@ -4595,21 +4595,24 @@
 ** Specifies how to sort messages in the "index" menu.  Valid values
 ** are:
 ** .il
-** .dd date or date-sent
+** .dd date
 ** .dd date-received
 ** .dd from
-** .dd mailbox-order (unsorted)
 ** .dd score
 ** .dd size
 ** .dd spam
 ** .dd subject
 ** .dd threads
 ** .dd to
+** .dd unsorted
 ** .ie
 ** .pp
 ** You may optionally use the "reverse-" prefix to specify reverse sorting
 ** order.
 ** .pp
+** The "date-sent" value is a synonim for "date". The "mailbox-order" value is
+** a synonym for "unsorted".
+** .pp
 ** Example:
 ** .ts
 ** set sort=reverse-date-sent
@@ -4640,7 +4643,7 @@
 ** When sorting by threads, this variable controls how threads are sorted
 ** in relation to other threads, and how the branches of the thread trees
 ** are sorted.  This can be set to any value that $$sort can, except
-** "threads" (in that case, NeoMutt will just use "date-sent").  You can also
+** "threads" (in that case, NeoMutt will just use "date").  You can also
 ** specify the "last-" prefix in addition to the "reverse-" prefix, but "last-"
 ** must come after "reverse-".  The "last-" prefix causes messages to be
 ** sorted against its siblings by which has the last descendant, using
@@ -4675,6 +4678,8 @@
 ** .pp
 ** You may optionally use the "reverse-" prefix to specify reverse sorting
 ** order (example: "\fCset sort_browser=reverse-date\fP").
+** .pp
+** The "unread" value is a synonym for "new".
 */
 
 { "sort_re", DT_BOOL, true },
diff --git a/mutt_config.c b/mutt_config.c
index 7e565f30144..a316313082a 100644
--- a/mutt_config.c
+++ b/mutt_config.c
@@ -83,16 +83,17 @@ bool C_IgnoreLinearWhiteSpace = false;
 const struct Mapping SortAuxMethods[] = {
   // clang-format off
   { "date",          SORT_DATE },
-  { "date-received", SORT_RECEIVED },
   { "date-sent",     SORT_DATE },
+  { "threads",       SORT_DATE },
+  { "date-received", SORT_RECEIVED },
   { "from",          SORT_FROM },
   { "label",         SORT_LABEL },
+  { "unsorted",      SORT_ORDER },
   { "mailbox-order", SORT_ORDER },
   { "score",         SORT_SCORE },
   { "size",          SORT_SIZE },
   { "spam",          SORT_SPAM },
   { "subject",       SORT_SUBJECT },
-  { "threads",       SORT_DATE },
   { "to",            SORT_TO },
   { NULL,            0 },
   // clang-format on
@@ -104,10 +105,11 @@ const struct Mapping SortAuxMethods[] = {
 const struct Mapping SortMethods[] = {
   // clang-format off
   { "date",          SORT_DATE },
-  { "date-received", SORT_RECEIVED },
   { "date-sent",     SORT_DATE },
+  { "date-received", SORT_RECEIVED },
   { "from",          SORT_FROM },
   { "label",         SORT_LABEL },
+  { "unsorted",      SORT_ORDER },
   { "mailbox-order", SORT_ORDER },
   { "score",         SORT_SCORE },
   { "size",          SORT_SIZE },
diff --git a/sidebar/config.c b/sidebar/config.c
index ef9a181c64b..f02723c23d0 100644
--- a/sidebar/config.c
+++ b/sidebar/config.c
@@ -37,16 +37,16 @@
  */
 const struct Mapping SortSidebarMethods[] = {
   // clang-format off
+  { "path",          SORT_PATH },
   { "alpha",         SORT_PATH },
+  { "name",          SORT_PATH },
   { "count",         SORT_COUNT },
   { "desc",          SORT_DESC },
   { "flagged",       SORT_FLAGGED },
+  { "unsorted",      SORT_ORDER },
   { "mailbox-order", SORT_ORDER },
-  { "name",          SORT_PATH },
   { "new",           SORT_UNREAD },
-  { "path",          SORT_PATH },
   { "unread",        SORT_UNREAD },
-  { "unsorted",      SORT_ORDER },
   { NULL,            0 },
   // clang-format on
 };
diff --git a/test/config/dump.c b/test/config/dump.c
index d3bdad4ce00..3a8e78adaf4 100644
--- a/test/config/dump.c
+++ b/test/config/dump.c
@@ -57,10 +57,11 @@ static struct Mapping MboxTypeMap[] = {
  */
 const struct Mapping SortMangoMethods[] = {
   { "date",          SORT_DATE },
-  { "date-received", SORT_RECEIVED },
   { "date-sent",     SORT_DATE },
+  { "date-received", SORT_RECEIVED },
   { "from",          SORT_FROM },
   { "label",         SORT_LABEL },
+  { "unsorted",      SORT_ORDER },
   { "mailbox-order", SORT_ORDER },
   { "score",         SORT_SCORE },
   { "size",          SORT_SIZE },
diff --git a/test/config/helpers.c b/test/config/helpers.c
index e93a1acc3c2..a06561fcc27 100644
--- a/test/config/helpers.c
+++ b/test/config/helpers.c
@@ -57,10 +57,11 @@ static struct Mapping MboxTypeMap[] = {
  */
 static const struct Mapping SortMangoMethods[] = {
   { "date",          SORT_DATE },
-  { "date-received", SORT_RECEIVED },
   { "date-sent",     SORT_DATE },
+  { "date-received", SORT_RECEIVED },
   { "from",          SORT_FROM },
   { "label",         SORT_LABEL },
+  { "unsorted",      SORT_ORDER },
   { "mailbox-order", SORT_ORDER },
   { "score",         SORT_SCORE },
   { "size",          SORT_SIZE },
diff --git a/test/config/sort.c b/test/config/sort.c
index 97214193f40..884e2a9e0c5 100644
--- a/test/config/sort.c
+++ b/test/config/sort.c
@@ -61,6 +61,7 @@ const struct Mapping SortTestMethods[] = {
   { "date-received", SORT_RECEIVED },
   { "from",          SORT_FROM },
   { "label",         SORT_LABEL },
+  { "unsorted",      SORT_ORDER },
   { "mailbox-order", SORT_ORDER },
   { "score",         SORT_SCORE },
   { "size",          SORT_SIZE },