4 files changed, 95 insertions, 42 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index c0ce026a6..4db3e5fd4 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -5084,133 +5084,159 @@
         }
       },
       {
-        "defaultMessage": "!!!Accent color",
+        "defaultMessage": "!!!Use vertical style",
         "end": {
           "column": 3,
           "line": 145
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.useVerticalStyle",
+        "start": {
+          "column": 20,
+          "line": 142
+        }
+      },
+      {
+        "defaultMessage": "!!!Always show workspace drawer",
+        "end": {
+          "column": 3,
+          "line": 149
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.alwaysShowWorkspaces",
+        "start": {
+          "column": 24,
+          "line": 146
+        }
+      },
+      {
+        "defaultMessage": "!!!Accent color",
+        "end": {
+          "column": 3,
+          "line": 153
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 142
+          "line": 150
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 149
+          "line": 157
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 146
+          "line": 154
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 153
+          "line": 161
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 150
+          "line": 158
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 157
+          "line": 165
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 154
+          "line": 162
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 161
+          "line": 169
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 158
+          "line": 166
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 165
+          "line": 173
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 162
+          "line": 170
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 169
+          "line": 177
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 166
+          "line": 174
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 173
+          "line": 181
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 170
+          "line": 178
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 177
+          "line": 185
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 174
+          "line": 182
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 181
+          "line": 189
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 178
+          "line": 186
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ee6fc2b29..9bf4fcc15 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -287,6 +287,7 @@
   "settings.app.currentVersion": "Current version:",
   "settings.app.form.accentColor": "Accent color",
   "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting",
+  "settings.app.form.alwaysShowWorkspaces": "Always show workspace drawer",
   "settings.app.form.autoLaunchInBackground": "Open in background",
   "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start",
   "settings.app.form.automaticUpdates": "Enable updates",
@@ -323,6 +324,7 @@
   "settings.app.form.startMinimized": "Start minimized",
   "settings.app.form.universalDarkMode": "Enable universal Dark Mode",
   "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi",
+  "settings.app.form.useVerticalStyle": "Use vertical style",
   "settings.app.headline": "Settings",
   "settings.app.headlineAdvanced": "Advanced",
   "settings.app.headlineAppearance": "Appearance",
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json
index 32960f8ce..fe51488c7 100644
--- a/src/i18n/locales/whitelist_en-US.json
+++ b/src/i18n/locales/whitelist_en-US.json
@@ -1,2 +1 @@
-[
-]
\ No newline at end of file
+[]
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index df5e7714a..7165bd46c 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -364,15 +364,41 @@
     }
   },
   {
+    "id": "settings.app.form.useVerticalStyle",
+    "defaultMessage": "!!!Use vertical style",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 142,
+      "column": 20
+    },
+    "end": {
+      "line": 145,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.alwaysShowWorkspaces",
+    "defaultMessage": "!!!Always show workspace drawer",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 146,
+      "column": 24
+    },
+    "end": {
+      "line": 149,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.accentColor",
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 142,
+      "line": 150,
       "column": 15
     },
     "end": {
-      "line": 145,
+      "line": 153,
       "column": 3
     }
   },
@@ -381,11 +407,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 146,
+      "line": 154,
       "column": 24
     },
     "end": {
-      "line": 149,
+      "line": 157,
       "column": 3
     }
   },
@@ -394,11 +420,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 150,
+      "line": 158,
       "column": 29
     },
     "end": {
-      "line": 153,
+      "line": 161,
       "column": 3
     }
   },
@@ -407,11 +433,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 154,
+      "line": 162,
       "column": 16
     },
     "end": {
-      "line": 157,
+      "line": 165,
       "column": 3
     }
   },
@@ -420,11 +446,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 158,
+      "line": 166,
       "column": 23
     },
     "end": {
-      "line": 161,
+      "line": 169,
       "column": 3
     }
   },
@@ -433,11 +459,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 162,
+      "line": 170,
       "column": 25
     },
     "end": {
-      "line": 165,
+      "line": 173,
       "column": 3
     }
   },
@@ -446,11 +472,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 166,
+      "line": 174,
       "column": 8
     },
     "end": {
-      "line": 169,
+      "line": 177,
       "column": 3
     }
   },
@@ -459,11 +485,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 170,
+      "line": 178,
       "column": 20
     },
     "end": {
-      "line": 173,
+      "line": 181,
       "column": 3
     }
   },
@@ -472,11 +498,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 174,
+      "line": 182,
       "column": 15
     },
     "end": {
-      "line": 177,
+      "line": 185,
       "column": 3
     }
   },
@@ -485,11 +511,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 178,
+      "line": 186,
       "column": 27
     },
     "end": {
-      "line": 181,
+      "line": 189,
       "column": 3
     }
   }