diff --git a/plugins/demo-account/storage.php b/plugins/demo-account/storage.php
index 8e6411702..511bf4226 100644
--- a/plugins/demo-account/storage.php
+++ b/plugins/demo-account/storage.php
@@ -37,7 +37,8 @@ class DemoStorage extends \RainLoop\Providers\Storage\FileStorage
 		}
 		$sDataPath .= '/' . \MailSo\Base\Utils::SecureFileName($_COOKIE['smctoken']);
 		if (!\is_dir($sDataPath) && \mkdir($sDataPath, 0700, true)) {
-			\file_put_contents("{$sDataPath}/settings",'{"RemoveColors":true,"ListInlineAttachments":true}');
+			\file_put_contents("{$sDataPath}/settings",'{"RemoveColors":true,"ListInlineAttachments":true,"listGrouped":true}');
+			\file_put_contents("{$sDataPath}/settings_local",'{"UseThreads":true}');
 			if (\mkdir($sDataPath.'/.gnupg/private-keys-v1.d', 0700, true)) {
 				// AES
 				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/3106F4281F98D820114228FEF16B5BA0D78AA005.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/3106F4281F98D820114228FEF16B5BA0D78AA005.key"));