diff --git a/program/actions/settings/folder_edit.php b/program/actions/settings/folder_edit.php
index dc527e1bdc..31d4071336 100644
--- a/program/actions/settings/folder_edit.php
+++ b/program/actions/settings/folder_edit.php
@@ -156,6 +156,16 @@ public static function folder_form($attrib)
                 'label' => $rcmail->gettext('parentfolder'),
                 'value' => $select->show($selected),
             ];
+
+            $upBtn = new html_button(['id' => 'move-folder-up', 'class' => 'move-folder-up']);
+            $downBtn = new html_button(['id' => 'move-folder-down', 'class' => 'move-folder-down']);
+            $form['props']['fieldsets']['location']['content']['order'] = [
+                'label' => $rcmail->gettext('reorder_folder'),
+                'value' => html::div([], [
+                    $upBtn->show($rcmail->gettext('reorder_folder_up')),
+                    $downBtn->show($rcmail->gettext('reorder_folder_down')),
+                ]),
+            ];
         }
 
         // Settings
diff --git a/program/actions/settings/folder_reorder.php b/program/actions/settings/folder_reorder.php
new file mode 100644
index 0000000000..c98ae237e7
--- /dev/null
+++ b/program/actions/settings/folder_reorder.php
@@ -0,0 +1,22 @@
+<?php
+
+class rcmail_action_settings_folder_reorder extends rcmail_action_settings_folders
+{
+    protected static $mode = self::MODE_AJAX;
+
+    /**
+     * Request handler.
+     *
+     * @param array $args Arguments from the previous step(s)
+     */
+    #[\Override]
+    public function run($args = [])
+    {
+        $rcmail = rcmail::get_instance();
+        $list = array_flip(rcube_utils::get_input_value('folderorder', rcube_utils::INPUT_POST, true));
+        $rcmail->user->save_prefs(['folder_order' => $list]);
+
+        $rcmail->output->show_message('successfullysaved', 'confirmation');
+        $rcmail->output->send();
+    }
+}
diff --git a/program/actions/settings/folders.php b/program/actions/settings/folders.php
index 162f382394..a6c9940840 100644
--- a/program/actions/settings/folders.php
+++ b/program/actions/settings/folders.php
@@ -34,6 +34,7 @@ public function run($args = [])
         $storage = $rcmail->get_storage();
 
         $rcmail->output->set_pagetitle($rcmail->gettext('folders'));
+        $rcmail->output->set_env('folder_ordered_manually', !empty($rcmail->user->get_prefs()['folder_order']));
         $rcmail->output->set_env('prefix_ns', $storage->get_namespace('prefix'));
         $rcmail->output->set_env('quota', (bool) $storage->get_capability('QUOTA'));
         $rcmail->output->include_script('treelist.js');
@@ -262,6 +263,10 @@ public static function folder_tree_element($folders, &$key, &$js_folders)
             'id' => $idx,
             'class' => trim($data['class'] . ' mailbox'),
         ];
+        // Only allow reordering of non-protected folders.
+        if ($data['protected']) {
+            $attribs['class'] .= ' protected';
+        }
 
         if (!isset($data['level'])) {
             $data['level'] = 0;
diff --git a/program/js/app.js b/program/js/app.js
index 7e6bb9bfb7..c9e4d72a10 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -629,6 +629,7 @@ function rcube_webmail() {
                     this.enable_command('save', 'folder-size', true);
                     parent.rcmail.env.exists = this.env.messagecount;
                     parent.rcmail.enable_command('purge', this.env.messagecount);
+                    ref.handle_folder_sorting_icons();
                 } else if (this.env.action == 'responses') {
                     this.enable_command('add', true);
                 }
@@ -7793,6 +7794,7 @@ function rcube_webmail() {
             id_encode: this.html_identifier_encode,
             id_decode: this.html_identifier_decode,
             searchbox: '#foldersearch',
+            sortable: true,
         });
 
         this.subscription_list
@@ -7809,39 +7811,173 @@ function rcube_webmail() {
                 if (p.query) {
                     ref.subscription_select();
                 }
-            })
-            .draggable({ cancel: 'li.mailbox.root,input,div.treetoggle,.custom-control' })
-            .droppable({
-                // @todo: find better way, accept callback is executed for every folder
-                // on the list when dragging starts (and stops), this is slow, but
-                // I didn't find a method to check droptarget on over event
-                accept: function (node) {
-                    if (!node.is('.mailbox')) {
-                        return false;
-                    }
+            });
 
-                    var source_folder = ref.folder_id2name(node.attr('id')),
-                        dest_folder = ref.folder_id2name(this.id),
-                        source = ref.env.subscriptionrows[source_folder],
-                        dest = ref.env.subscriptionrows[dest_folder];
+        this.make_folder_lists_sortable();
+    };
+
+    // TODO: In the receive callback, can we wait for the confirmation dialog without introducing async/await and Promises?
+    this.make_folder_lists_sortable = () => {
+        const mainFolderList = this.gui_objects.subscriptionlist;
+        $folderLists = $('ul', mainFolderList.parentElement);
+        $folderLists.sortable({
+            axis: 'y',
+            // We can't use `li.mailbox.protected` here because that would disable moving elements out of protected
+            // folders. jQuery UI uses `closest()` with this selector, which makes it impossible to keep main list items
+            // and sub-list items apart. We disable sorting protected items via a `mousedown` event in treelist.js.
+            cancel: 'input, div.treetoggle, .custom-control',
+            helper: 'clone', // a clone doesn't have the borders, which looks nicer.
+            items: '> li.mailbox', // handle only the directly descending items, not those of sub-lists (they get they own instance of $.sortable()
+            connectWith: `#${mainFolderList.id}, #${mainFolderList.id} ul`,
+            forcePlaceholderSize: true, // Make the placeholder displace the neighboring elements.
+            placeholder: 'placeholder', // Class name for the placeholder
+            change: (event, ui) => {
+                // Prevent sortable folders being sorted in between (technically: before) protected folders. There is no
+                // technical reason for this, we just want it from a UX perspective.
+                if (ui.placeholder.next().is('.protected')) {
+                    ui.placeholder.hide();
+                } else {
+                    ui.placeholder.show();
+                }
+            },
+            over: (event, ui) => {
+                // Highlight the list that the dragged element is hovering over.
+                $('.hover', $folderLists).removeClass('hover');
+                if (event.target !== mainFolderList) {
+                    $(event.target).closest('li').addClass('hover');
+                }
+            },
+            receive: async (event, ui) => {
+                $('.hover', $folderLists).removeClass('hover');
+                const folderId = ui.item.attr('id');
+                const folderName = ref.folder_id2name(folderId);
+                const folderAttribs = ref.env.subscriptionrows[folderName];
+
+                let destName;
+                if (event.target === mainFolderList) {
+                    destName = '*';
+                } else {
+                    const destId = event.target.parentElement.id;
+                    destName = ref.folder_id2name(destId);
+                }
 
-                    return source && !source[2]
-                        && dest_folder != source_folder.replace(ref.last_sub_rx, '')
-                        && !dest_folder.startsWith(source_folder + ref.env.delimiter);
-                },
-                drop: function (e, ui) {
-                    var source = ref.folder_id2name(ui.draggable.attr('id')),
-                        dest = ref.folder_id2name(this.id);
+                if (!(
+                    folderAttribs && !folderAttribs[2]
+                    && destName != folderName.replace(ref.last_sub_rx, '')
+                    && !destName.startsWith(folderName + ref.env.delimiter)
+                )) {
+                    ui.sender.sortable('cancel');
+                }
 
-                    ref.subscription_move_folder(source, dest);
-                },
-            });
+                const result = await ref.subscription_move_folder(folderName, destName);
+                if (!result) {
+                    ui.sender.sortable('cancel');
+                }
+            },
+            stop: (event, ui) => {
+                $('.hover', $folderLists).removeClass('hover');
+                if (ui.item.next().is('.protected')) {
+                    ui.item.parent().sortable('cancel');
+                    return false;
+                }
+                // Save the order if the item was moved only within its list. In case it was moved into a (different)
+                // sub-list, the order-saving function gets called from the server's response after the relevant folder
+                // rows have been re-rendered, and we can save one HTTP request. We don't skip the other function call
+                // because in this moment here we don't know yet if the confirmation dialog about moving the folder will
+                // be confirmed or cancelled.
+                if (ui.item[0].parentElement === event.target) {
+                    ref.save_reordered_folder_list();
+                }
+            },
+        });
+    };
+
+    this.save_reordered_folder_list = () => {
+        const mainList = ref.subscription_list.container.sortable('toArray');
+        const subLists = ref.subscription_list.container.find('.ui-sortable').map((i, elem) => ({
+            parentId: elem.parentElement.id,
+            elems: $(elem).sortable('toArray'),
+        })).toArray();
+        // Sort sub-lists after their their parent element, so the sorting for the settings page doesn't get confused
+        // (which will hook child-folders onto wrong parents if we don't do this).
+        subLists.forEach((subList) => {
+            mainList.splice(mainList.indexOf(subList.parentId) + 1, 0, ...subList.elems);
+        });
+        params = mainList.map((e) => e.replace(/^rcmli/, 'folderorder[]=')).join('&');
+        this.http_post('folder-reorder', params, this.display_message('', 'loading'));
     };
 
     this.folder_id2name = function (id) {
         return id ? ref.html_identifier_decode(id.replace(/^rcmli/, '')) : null;
     };
 
+    this.folder_name2id = function (name) {
+        if (!name) {
+            return null;
+        }
+        return 'rcmli' + ref.html_identifier_encode(name);
+    };
+
+    this.handle_folder_sorting_icons = function () {
+        const folder_li = window.parent.rcmail.get_folder_li(ref.env.folder, null, true);
+        const upIcon = $('#move-folder-up');
+        const downIcon = $('#move-folder-down');
+        const prevElem = folder_li.previousElementSibling;
+        const nextElem = folder_li.nextElementSibling;
+
+        upIcon.off('click');
+        if (prevElem === null || prevElem.classList.contains('protected')) {
+            upIcon.attr('disabled', 'disabled').addClass('disabled');
+        } else {
+            upIcon.attr('disabled', null).removeClass('disabled');
+            upIcon.on('click', () => {
+                ref.move_folder_up(ref.env.folder);
+                ref.handle_folder_sorting_icons();
+            });
+        }
+
+        downIcon.off('click');
+        if (nextElem === null || nextElem.classList.contains('protected')) {
+            downIcon.attr('disabled', 'disabled').addClass('disabled');
+        } else {
+            downIcon.attr('disabled', null).removeClass('disabled');
+            downIcon.on('click', () => {
+                ref.move_folder_down(ref.env.folder);
+                ref.handle_folder_sorting_icons();
+            });
+        }
+    };
+
+    this.move_folder_up = function (name) {
+        if (ref.is_framed()) {
+            return window.parent.rcmail.move_folder_up(name);
+        }
+        const elem = ref.get_folder_li(name, null, true);
+        if (!elem || elem.classList.contains('protected')) {
+            return;
+        }
+        const prevSibling = elem.previousElementSibling;
+        if (prevSibling && !prevSibling.classList.contains('protected')) {
+            prevSibling.before(elem);
+        }
+        ref.save_reordered_folder_list();
+    };
+
+    this.move_folder_down = function (name) {
+        if (ref.is_framed()) {
+            return window.parent.rcmail.move_folder_down(name);
+        }
+        const elem = ref.get_folder_li(name, null, true);
+        if (!elem || elem.classList.contains('protected')) {
+            return;
+        }
+        const nextSibling = elem.nextElementSibling;
+        if (nextSibling) {
+            nextSibling.after(elem);
+        }
+        ref.save_reordered_folder_list();
+    };
+
     this.subscription_select = function (id) {
         var folder;
 
@@ -7864,12 +8000,29 @@ function rcube_webmail() {
                 newname = to === '' || to === '*' ? basename : to + this.env.delimiter + basename;
 
             if (newname != from) {
-                this.confirm_dialog(this.get_label('movefolderconfirm'), 'move', function () {
-                    ref.http_post('rename-folder', { _folder_oldname: from, _folder_newname: newname },
-                        ref.set_busy(true, 'foldermoving'));
-                }, { button_class: 'save move' });
+                return new Promise((resolve, _reject) => {
+                    this.confirm_dialog(
+                        this.get_label('movefolderconfirm'),
+                        'move',
+                        function () {
+                            ref.http_post('rename-folder',
+                                {
+                                    _folder_oldname: from,
+                                    _folder_newname: newname,
+                                },
+                                ref.set_busy(true, 'foldermoving')
+                            );
+                            resolve(true);
+                        },
+                        {
+                            button_class: 'save move',
+                            cancel_func: (e, ref) => resolve(false),
+                        }
+                    );
+                });
             }
         }
+        return Promise.resolve(true);
     };
 
     // tell server to create and subscribe a new mailbox
@@ -7891,7 +8044,7 @@ function rcube_webmail() {
     };
 
     // Add folder row to the table and initialize it
-    this.add_folder_row = function (id, name, display_name, is_protected, subscribed, class_name, refrow, subfolders) {
+    this.add_folder_row = function (id, name, display_name, is_protected, subscribed, class_name, refrow, subfolders, insert_before_elem) {
         if (!this.gui_objects.subscriptionlist) {
             return false;
         }
@@ -7920,7 +8073,7 @@ function rcube_webmail() {
         }
 
         // set ID, reset css class
-        row.attr({ id: 'rcmli' + this.html_identifier_encode(id), class: class_name });
+        row.attr({ id: this.folder_name2id(id), class: class_name });
 
         if (!refrow || !refrow.length) {
             // remove old data, subfolders and toggle
@@ -8029,7 +8182,11 @@ function rcube_webmail() {
                 }
             }
 
-            if (parent && n == parent) {
+            if (insert_before_elem && $(insert_before_elem).parents('li')[0] === parent) {
+                // In this case we theoretically could have skipped the sorting above, but trying to do that resulted in
+                // strange side effects, so I kept the code in.
+                $(insert_before_elem).before(row);
+            } else if (parent && n == parent) {
                 $('ul', parent).first().append(row);
             } else {
                 while (p = $(n).parent().parent().get(0)) {
@@ -8070,6 +8227,8 @@ function rcube_webmail() {
             this.triggerEvent('clonerow', { row: row, id: id });
         }
 
+        this.make_folder_lists_sortable();
+
         return row;
     };
 
@@ -8110,7 +8269,7 @@ function rcube_webmail() {
                 folder = ref.env.subscriptionrows[fname],
                 newid = id + fname.slice(prefix_len_id);
 
-            this.id = 'rcmli' + ref.html_identifier_encode(newid);
+            this.id = this.folder_name2id(newid);
             $('input[name="_subscribed[]"]', this).first().val(newid);
             folder[0] = name + folder[0].slice(prefix_len_name);
 
@@ -8118,6 +8277,14 @@ function rcube_webmail() {
             delete ref.env.subscriptionrows[fname];
         });
 
+        if (this.env.folder_ordered_manually) {
+            // We need to store this information now, because it's not available anymore after removing the row from
+            // the DOM.
+            next_sibling = row.nextElementSibling;
+        } else {
+            next_sibling = null;
+        }
+
         // get row off the list
         row = $(row).detach();
 
@@ -8129,7 +8296,11 @@ function rcube_webmail() {
         }
 
         // move the existing table row
-        this.add_folder_row(id, name, display_name, is_protected, subscribed, class_name, row, subfolders);
+        this.add_folder_row(id, name, display_name, is_protected, subscribed, class_name, row, subfolders, next_sibling);
+
+        if (this.env.folder_ordered_manually) {
+            this.save_reordered_folder_list();
+        }
     };
 
     // remove the table row of a specific mailbox from the table
@@ -8790,6 +8961,8 @@ function rcube_webmail() {
             });
         }
 
+        options.close = close_func;
+
         return this.show_popup_dialog(content, title, buttons, options);
     };
 
@@ -8862,7 +9035,7 @@ function rcube_webmail() {
             prefix = 'rcmli';
         }
 
-        if (this.gui_objects.folderlist) {
+        if (this.gui_objects.folderlist || this.gui_objects.subscriptionlist) {
             name = this.html_identifier(name, encode);
             return document.getElementById(prefix + name);
         }
diff --git a/program/js/treelist.js b/program/js/treelist.js
index d75c9043a3..cd76835bd2 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -47,6 +47,7 @@ function rcube_treelist_widget(node, p) {
         keyboard: true,
         tabexit: true,
         parent_focus: false,
+        sortable: false,
         check_droptarget: function (node) {
             return !node.virtual;
         },
@@ -161,6 +162,14 @@ function rcube_treelist_widget(node, p) {
                 e.stopPropagation();
                 return false;
             }
+            // Prevent protected folders from being dragged/sorted.
+            // We can't use the options of $.sortable() for that (then sub-folders of protected folders couldn't be
+            // dragged, either), thus we implement it here.
+            if ($(e.target).parent().is('li.mailbox.protected')) {
+                e.preventDefault();
+                e.stopPropagation();
+                return false;
+            }
         });
 
     // activate search function
@@ -804,6 +813,16 @@ function rcube_treelist_widget(node, p) {
                 }
 
                 li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
+            } else if (p.sortable) {
+                li.children('div.treetoggle').remove();
+                // Add an empty sublist if none exists yet, so items can be pulled into it when sorting.
+                if (li.children('ul').length === 0) {
+                    const ul = $('<ul>').appendTo(li)
+                        .attr('role', 'group');
+                    if (node.childlistclass) {
+                        ul.attr('class', node.childlistclass);
+                    }
+                }
             }
             if (li.hasClass('selected')) {
                 li.attr('aria-selected', 'true');
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 0f092ba8df..ad142e8254 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -4401,9 +4401,27 @@ public function sort_folder_list($a_folders, $skip_special = false)
         // sort folders
         // asort($folders, SORT_LOCALE_STRING) is not properly sorting case sensitive names
         uasort($folders, [$this, 'sort_folder_comparator']);
-
         $folders = array_keys($folders);
 
+        $prefs = rcube::get_instance()->user->get_prefs();
+        if (isset($prefs['folder_order'])) {
+            $folder_order = $prefs['folder_order'];
+            $new_list = [];
+            foreach ($folders as $folder_name) {
+                if (!is_string($folder_name)) {
+                    continue;
+                }
+                $folder_id = rcube_utils::html_identifier($folder_name, true);
+                // If the folder doesn't have a position, e.g. because it wasn't yet part of a list that has been
+                // reordered, just append it to the end (but keep the original sorting order within the "un-ordered"
+                // folders).
+                $index = $folder_order[$folder_id] ?? 100000 + count($new_list);
+                $new_list[$index] = $folder_name;
+            }
+            ksort($new_list);
+            $folders = array_values($new_list);
+        }
+
         if ($skip_special || empty($folders)) {
             return $folders;
         }
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index bab851966e..ec40ac7be0 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -796,3 +796,7 @@ $labels['helplistkeyboardnavmessages'] = "Arrows right/left: expand/collapse mes
 Enter: Open the selected/focused message.
 Delete: Move selected messages to Trash.";
 $labels['helplistkeyboardnavcontacts'] = "Enter: Open the selected/focused contact.";
+
+$labels['reorder_folder'] = 'Reorder folder in list';
+$labels['reorder_folder_up'] = 'up';
+$labels['reorder_folder_down'] = 'down';
diff --git a/skins/elastic/styles/dark.less b/skins/elastic/styles/dark.less
index a5731884c4..a58a2ba5e5 100644
--- a/skins/elastic/styles/dark.less
+++ b/skins/elastic/styles/dark.less
@@ -257,10 +257,22 @@ html.dark-mode {
 
     .listing li ul,
     .listing tbody td,
-    .listing li {
+    .listing li,
+    .listing li ul li:first-child {
         border-color: @color-dark-list-border;
     }
 
+    #subscription-table {
+        .placeholder {
+            /* color-dark-list-border is a little too dark here, so we use the input border color */
+            border-color: @color-dark-input-border;
+        }
+
+        .hover {
+            background-color: @color-dark-list-droptarget-background;
+        }
+    }
+
     .listing li.selected,
     .listing li.selected > a,
     .listing li.selected > div > a, // this is used e.g. by kolab_addressbook
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 6e912f5902..05f4821b79 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -312,6 +312,20 @@ input.smart-upload {
             }
         }
     }
+
+    .move-folder-up:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-arrow-up;
+    }
+
+    .move-folder-down {
+        margin-left: 1rem;
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-arrow-down;
+        }
+    }
+
 }
 
 @media screen and (max-width: @screen-width-bs-phone) {
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 0e016df6da..c736955135 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -151,18 +151,25 @@ ul.listing {
     }
 
     li {
-        .overflow-ellipsis();
         white-space: nowrap;
         position: relative;
         list-style: none;
 
+        a {
+            .overflow-ellipsis();
+        }
+
         ul {
-            border-top: 1px solid @color-list-border;
+            min-height: 1.5rem;
             padding-left: 1.5em;
 
             li:last-child {
                 border-bottom: none;
             }
+
+            li:first-child {
+                border-top: 1px solid @color-list-border;
+            }
         }
 
         .custom-switch {
@@ -611,6 +618,40 @@ ul.treelist {
     &.menu a:before {
         margin-left: .5em;
     }
+
+    // Styles for the sortable list of folders in the settings.
+    &.ui-sortable {
+        // Using an ID here to overwrite the styles from other rules, which also use this ID as selector.
+        &#subscription-table ul {
+            // Make the sub-list overlay its parent element so an item that is visually hovering over the parent element is actually hovering over the sub-list and thus gets sorted into it.
+            margin-top: -2rem;
+            padding-top: 2rem;
+            padding-bottom: 0;
+        }
+
+        // Give the list items a little bit more space at top to counter the increased space required by the sub-lists at the bottom.
+        li {
+            padding-top: 0.5rem;
+        }
+
+        li div.treetoggle {
+            top: 0.5rem;
+        }
+
+        .custom-control-label {
+            top: 0.5rem;
+        }
+
+        li ul li:first-child {
+            margin-top: 0.5rem;
+        }
+
+        // To counter the counter, give the first sub-list layer a small padding at the bottom to even out the increased margins/paddings at the top of the elements.
+        &#subscription-table > li > ul {
+            padding-bottom: 0.5rem;
+        }
+
+    }
 }
 
 
@@ -1101,7 +1142,30 @@ html.touch {
 }
 
 #subscription-table {
+    padding-bottom: 2em;
+
     li.mailbox a {
         padding-right: 2.5rem;
     }
+
+    ul {
+      list-style-type: none;
+      display: block;
+      min-height: 1rem;
+      margin: 0;
+      padding: 0 0 0.5em 1rem;
+    }
+
+    .placeholder {
+        border: dashed thin @color-input-border;
+        min-height: 1.5rem;
+    }
+
+    .hover {
+        background-color: @color-list-droptarget-background;
+
+        .placeholder {
+            margin-left: 3em;
+        }
+    }
 }