diff --git a/.ci/config-test.inc.php b/.ci/config-test.inc.php
index 1432b7d142..1206ddffad 100644
--- a/.ci/config-test.inc.php
+++ b/.ci/config-test.inc.php
@@ -35,6 +35,7 @@
     'attachment_reminder',
     'markasjunk',
     'zipdownload',
+    'persisted_login',
 ];
 
 $config['archive_mbox'] = 'Archive';
diff --git a/.tx/config b/.tx/config
index e86eabe63a..c2b05bbc8f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -72,6 +72,11 @@ file_filter = plugins/password/localization/<lang>.inc
 source_file = plugins/password/localization/en_US.inc
 source_lang = en_US
 
+[o:roundcube:p:roundcube-webmail:r:plugin-persisted-login]
+file_filter = plugins/persisted_login/localization/<lang>.inc
+source_file = plugins/persisted_login/localization/en_US.inc
+source_lang = en_US
+
 [o:roundcube:p:roundcube-webmail:r:plugin-subscriptions_option]
 file_filter = plugins/subscriptions_option/localization/<lang>.inc
 source_file = plugins/subscriptions_option/localization/en_US.inc
@@ -96,4 +101,3 @@ source_lang = en_US
 file_filter = program/localization/<lang>/timezones.inc
 source_file = program/localization/en_US/timezones.inc
 source_lang = en_US
-
diff --git a/plugins/persisted_login/README.md b/plugins/persisted_login/README.md
new file mode 100644
index 0000000000..4311a5252d
--- /dev/null
+++ b/plugins/persisted_login/README.md
@@ -0,0 +1,26 @@
+Persisted login Roundcubemail plugin
+====================================
+
+This plugin adds a toggle switch into the login form of Roundcubemail's "elastic" skin, that makes the session live for a configured number of days (instead of only for the session).
+
+In effect, logins stay valid across network changes of clients, etc.
+
+From a technical point of view this plugin (if enabled) overrides `$config['session_lifetime']` (which sets the session garbage collection max lifetime in PHP) to match the number of days set in its own config.
+
+Usage
+-----
+
+Enable the plugin in your Roundcubemail's config:
+
+```php
+$config['plugins'] = [ …, 'persisted_login'];
+```
+
+By default logins are persisted for 7 days. That value can be changed via the config option `persisted_login_days` in the
+config file of this plugin. (Make sure that the config file ends in `.php` to have it used by Roundcubemail.)
+
+
+Credits
+-------
+
+Most of this code was actually written by [Github-Citizen](https://github.com/Github-Citizen) for https://github.com/roundcube/roundcubemail/pull/8689, which fell through due to styling issues, and only cleaned up and renamed for this plugin.
diff --git a/plugins/persisted_login/config.inc.php.dist b/plugins/persisted_login/config.inc.php.dist
new file mode 100644
index 0000000000..2e3317b835
--- /dev/null
+++ b/plugins/persisted_login/config.inc.php.dist
@@ -0,0 +1,17 @@
+<?php
+
+// Set the number of days a login will be valid for (if the user toggles the
+// switch at login).
+//
+// The maximum number of days that can be set is 365 (1 year).
+// The minimum value is 1.
+// The default value is 7. This number will be also be used if the config option is set to something else than an
+// integer.
+//
+// To disable the plugin, remove it from the list of plugins in Roundcube's config.inc.php.
+//
+// Technical note; This plugin will over-ride $config['session_lifetime']
+// (which sets the session garbage collection max lifetime in PHP) to match the
+// number of days set above.
+
+$config['persisted_login_days'] = 7;
diff --git a/plugins/persisted_login/localization/en_US.inc b/plugins/persisted_login/localization/en_US.inc
new file mode 100644
index 0000000000..608c900cab
--- /dev/null
+++ b/plugins/persisted_login/localization/en_US.inc
@@ -0,0 +1,6 @@
+<?php
+
+// When translating keep the '#' symbol in the sentence and it will be
+// converted to the number of days set in the config.inc.php file.
+
+$labels['switch_text'] = 'Persist login for # days';
diff --git a/plugins/persisted_login/persisted_login.js b/plugins/persisted_login/persisted_login.js
new file mode 100644
index 0000000000..d54146f597
--- /dev/null
+++ b/plugins/persisted_login/persisted_login.js
@@ -0,0 +1,26 @@
+// Run on 'elastic' and all derivate skins.
+if (window.rcmail && (window.rcmail.env.skin == 'elastic' || rcmail.env.skin_extends?.includes('elastic'))) {
+    rcmail.addEventListener('init', () => {
+        const days = rcmail.env.persisted_login_days;
+        let txt = rcmail.gettext('switch_text', 'persisted_login');
+        txt = txt.replace('#', days);
+
+        const elems = $('<tr>').addClass('form-group row').append(
+            $('<td>').addClass('title').hide(),
+            $('<td>').addClass('input input-group input-group-lg').append(
+                $('<div>').addClass('custom-control custom-switch').css('padding', '1em 0').append(
+                    $('<input>').attr({
+                        type: 'checkbox',
+                        class: 'custom-control-input',
+                        id: '_persisted_login',
+                        name: '_persisted_login',
+                        value: '1',
+                    }),
+                    $('<label>').attr({ class: 'custom-control-label', for: '_persisted_login' }).text(txt)
+                )
+            )
+        );
+
+        $('#login-form table tbody').append(elems);
+    });
+}
diff --git a/plugins/persisted_login/persisted_login.php b/plugins/persisted_login/persisted_login.php
new file mode 100644
index 0000000000..84ceedb615
--- /dev/null
+++ b/plugins/persisted_login/persisted_login.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Inject a toggle switch into the login form that makes the session live for a
+ * configured number of days (instead of only for the session).
+ */
+
+class persisted_login extends rcube_plugin
+{
+    private $rc;
+    private $days;
+
+    public function onload(): void
+    {
+        $this->rc = rcmail::get_instance();
+        $this->load_config();
+        $configured_days = $this->rc->config->get('persisted_login_days');
+        if (!is_int($configured_days)) {
+            $configured_days = 7;
+        }
+        // Make sure the value is in the range 1..365.
+        $this->days = min(max(1, $configured_days), 365);
+        $this->rc->config->set('session_lifetime', $this->days * 24 * 60);
+    }
+
+    #[\Override]
+    public function init(): void
+    {
+        $this->rc->output->set_env('persisted_login_days', $this->days);
+        $this->add_hook('template_object_loginform', [$this, 'login_page_template']);
+        $this->add_hook('login_after', [$this, 'login_success']);
+    }
+
+    public function login_page_template(array $args): array
+    {
+        $this->add_texts('localization', true);
+        $this->include_script('persisted_login.js');
+        return $args;
+    }
+
+    public function login_success(array $args): array
+    {
+        if (empty($_POST['_persisted_login'])) {
+            return $args;
+        }
+
+        $sessCookieName = $this->rc->config->get('session_name') ?: 'roundcube_sessid';
+        $authCookieName = $this->rc->config->get('session_auth_name') ?: 'roundcube_sessauth';
+        $sessCookieValue = session_id();
+        $authCookieValue = (isset($_COOKIE[$authCookieName])) ? $_COOKIE[$authCookieName] : 'Error: Auth Cookie Missing';
+        $exp = time() + ($this->days * 24 * 60 * 60);
+        rcube_utils::setcookie($sessCookieName, $sessCookieValue, $exp);
+        rcube_utils::setcookie($authCookieName, $authCookieValue, $exp);
+        return $args;
+    }
+}
diff --git a/tests/Browser/Logon/LoginTest.php b/tests/Browser/Logon/LoginTest.php
index 9f1a987c09..baaa131594 100644
--- a/tests/Browser/Logon/LoginTest.php
+++ b/tests/Browser/Logon/LoginTest.php
@@ -38,6 +38,12 @@ public function testLogin()
             $browser->assertVisible('#rcmloginsubmit');
             $browser->assertSee($this->app->config->get('product_name'));
 
+            // Check for element and text from the persisted_login plugin.
+            // The checkbox is hidden and replaced by a toggle switch via CSS, thus we check for presence, not for
+            // visibility.
+            $browser->assertPresent('input#_persisted_login');
+            $browser->assertSee('Persist login for 7 days');
+
             // Support link
             if ($url = $this->app->config->get('support_url')) {
                 $browser->assertSeeLink('Get support');