16 files changed, 316 insertions, 192 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 025a667db..1bbc1f1d4 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -454,6 +454,10 @@ export default @observer class EditServiceForm extends Component {
                 </div>
               </PremiumFeatureContainer>
             )}
+
+            <div className="user-agent">
+              <Input field={form.$('userAgentPref')} />
+            </div>
           </form>
 
           {action === 'edit' && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index b7e007186..d31bb8933 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -141,7 +141,7 @@ const messages = defineMessages({
     id: 'settings.app.currentVersion',
     defaultMessage: '!!!Current version:',
   },
-  enableGPUAccelerationInfo: {
+  appRestartRequired: {
     id: 'settings.app.restartRequired',
     defaultMessage: '!!!Changes require restart',
   },
@@ -596,7 +596,19 @@ export default @observer class EditSettingsForm extends Component {
             { this.state.activeSetttingsTab === 'advanced' && (
               <div>
                 <Toggle field={form.$('enableGPUAcceleration')} />
-                <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p>
+                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+
+                <Hr />
+
+                <Input
+                  placeholder="User Agent"
+                  onChange={e => this.submit(e)}
+                  field={form.$('userAgentPref')}
+                />
+                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+
+                <Hr />
+
                 <div className="settings__settings-group">
                   <h3>
                     {intl.formatMessage(messages.subheadlineCache)}
diff --git a/src/config.js b/src/config.js
index c85228d07..27ac6be0b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -164,6 +164,7 @@ export const DEFAULT_APP_SETTINGS = {
   automaticUpdates: true,
   showServiceNavigationBar: false,
   universalDarkMode: true,
+  userAgentPref: '',
   adaptableDarkMode: true,
   accentColor: DEFAULT_ACCENT_COLOR,
   serviceRibbonWidth: 68,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 9a200d734..77548bdcf 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -219,6 +219,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           options: spellcheckerLanguage,
           disabled: !stores.settings.app.enableSpellchecking,
         },
+        userAgentPref: {
+          label: intl.formatMessage(globalMessages.userAgentPref),
+          placeholder: service.defaultUserAgent,
+          value: service.userAgentPref ? service.userAgentPref : '',
+        },
       },
     };
 
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index a5dc427ba..2b2d7277b 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -18,6 +18,7 @@ import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 import { hash } from '../../helpers/password-helpers';
+import defaultUserAgent from '../../helpers/userAgent-helpers';
 
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -283,6 +284,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         showDragArea: settingsData.showDragArea,
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
+        userAgentPref: settingsData.userAgentPref,
         beta: settingsData.beta, // we need this info in the main process as well
         automaticUpdates: settingsData.automaticUpdates, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
@@ -524,6 +526,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           options: spellcheckingLanguages,
           default: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
         },
+        userAgentPref: {
+          label: intl.formatMessage(globalMessages.userAgentPref),
+          value: settings.all.app.userAgentPref,
+          default: DEFAULT_APP_SETTINGS.userAgentPref,
+          placeholder: defaultUserAgent(),
+        },
         darkMode: {
           label: intl.formatMessage(messages.darkMode),
           value: settings.all.app.darkMode,
diff --git a/src/i18n/globalMessages.js b/src/i18n/globalMessages.js
index 86fb9e18d..cc1239199 100644
--- a/src/i18n/globalMessages.js
+++ b/src/i18n/globalMessages.js
@@ -25,6 +25,10 @@ export default defineMessages({
     id: 'global.spellchecking.autodetect.short',
     defaultMessage: '!!!Automatic',
   },
+  userAgentPref: {
+    id: 'global.userAgentPref',
+    defaultMessage: '!!!User Agent',
+  },
   proRequired: {
     id: 'global.franzProRequired',
     defaultMessage: '!!!Franz Professional Required',
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index b8ea986ce..5fd5d6ff2 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4902,585 +4902,585 @@
         "defaultMessage": "!!!Launch Ferdi on start",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 35
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchOnStart",
         "start": {
           "column": 21,
-          "line": 31
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Open in background",
         "end": {
           "column": 3,
-          "line": 38
+          "line": 39
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.autoLaunchInBackground",
         "start": {
           "column": 26,
-          "line": 35
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Keep Ferdi in background when closing the window",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 43
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.runInBackground",
         "start": {
           "column": 19,
-          "line": 39
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Start minimized",
         "end": {
           "column": 3,
-          "line": 46
+          "line": 47
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.startMinimized",
         "start": {
           "column": 18,
-          "line": 43
+          "line": 44
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in System Tray",
         "end": {
           "column": 3,
-          "line": 50
+          "line": 51
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSystemTray",
         "start": {
           "column": 20,
-          "line": 47
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Always show Ferdi in Menu Bar",
         "end": {
           "column": 3,
-          "line": 54
+          "line": 55
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableMenuBar",
         "start": {
           "column": 17,
-          "line": 51
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Reload Ferdi after system resume",
         "end": {
           "column": 3,
-          "line": 58
+          "line": 59
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.reloadAfterResume",
         "start": {
           "column": 21,
-          "line": 55
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Minimize Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 63
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.minimizeToSystemTray",
         "start": {
           "column": 24,
-          "line": 59
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Close Ferdi to system tray",
         "end": {
           "column": 3,
-          "line": 66
+          "line": 67
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.closeToSystemTray",
         "start": {
           "column": 21,
-          "line": 63
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Don't show message content in notifications",
         "end": {
           "column": 3,
-          "line": 70
+          "line": 71
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.privateNotifications",
         "start": {
           "column": 24,
-          "line": 67
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Don't show notifications for clipboard events",
         "end": {
           "column": 3,
-          "line": 74
+          "line": 75
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.clipboardNotifications",
         "start": {
           "column": 26,
-          "line": 71
+          "line": 72
         }
       },
       {
         "defaultMessage": "!!!Notify TaskBar/Dock on new message",
         "end": {
           "column": 3,
-          "line": 78
+          "line": 79
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.notifyTaskBarOnMessage",
         "start": {
           "column": 26,
-          "line": 75
+          "line": 76
         }
       },
       {
         "defaultMessage": "!!!Navigation bar behaviour",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 83
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.navigationBarBehaviour",
         "start": {
           "column": 26,
-          "line": 79
+          "line": 80
         }
       },
       {
         "defaultMessage": "!!!Search engine",
         "end": {
           "column": 3,
-          "line": 86
+          "line": 87
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.searchEngine",
         "start": {
           "column": 16,
-          "line": 83
+          "line": 84
         }
       },
       {
         "defaultMessage": "!!!Send telemetry data",
         "end": {
           "column": 3,
-          "line": 90
+          "line": 91
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.sentry",
         "start": {
           "column": 10,
-          "line": 87
+          "line": 88
         }
       },
       {
         "defaultMessage": "!!!Enable service hibernation",
         "end": {
           "column": 3,
-          "line": 94
+          "line": 95
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernate",
         "start": {
           "column": 13,
-          "line": 91
+          "line": 92
         }
       },
       {
         "defaultMessage": "!!!Keep services in hibernation on startup",
         "end": {
           "column": 3,
-          "line": 98
+          "line": 99
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernateOnStartup",
         "start": {
           "column": 22,
-          "line": 95
+          "line": 96
         }
       },
       {
         "defaultMessage": "!!!Hibernation strategy",
         "end": {
           "column": 3,
-          "line": 102
+          "line": 103
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.hibernationStrategy",
         "start": {
           "column": 23,
-          "line": 99
+          "line": 100
         }
       },
       {
         "defaultMessage": "!!!Todo Server",
         "end": {
           "column": 3,
-          "line": 106
+          "line": 107
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.predefinedTodoServer",
         "start": {
           "column": 24,
-          "line": 103
+          "line": 104
         }
       },
       {
         "defaultMessage": "!!!Custom TodoServer",
         "end": {
           "column": 3,
-          "line": 110
+          "line": 111
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.customTodoServer",
         "start": {
           "column": 20,
-          "line": 107
+          "line": 108
         }
       },
       {
         "defaultMessage": "!!!Enable Password Lock",
         "end": {
           "column": 3,
-          "line": 114
+          "line": 115
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableLock",
         "start": {
           "column": 14,
-          "line": 111
+          "line": 112
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 119
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.lockPassword",
         "start": {
           "column": 16,
-          "line": 115
+          "line": 116
         }
       },
       {
         "defaultMessage": "!!!Allow using Touch ID to unlock",
         "end": {
           "column": 3,
-          "line": 122
+          "line": 123
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useTouchIdToUnlock",
         "start": {
           "column": 22,
-          "line": 119
+          "line": 120
         }
       },
       {
         "defaultMessage": "!!!Lock after inactivity",
         "end": {
           "column": 3,
-          "line": 126
+          "line": 127
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.inactivityLock",
         "start": {
           "column": 18,
-          "line": 123
+          "line": 124
         }
       },
       {
         "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
         "end": {
           "column": 3,
-          "line": 130
+          "line": 131
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnabled",
         "start": {
           "column": 23,
-          "line": 127
+          "line": 128
         }
       },
       {
         "defaultMessage": "!!!From",
         "end": {
           "column": 3,
-          "line": 134
+          "line": 135
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDStart",
         "start": {
           "column": 21,
-          "line": 131
+          "line": 132
         }
       },
       {
         "defaultMessage": "!!!To",
         "end": {
           "column": 3,
-          "line": 138
+          "line": 139
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.scheduledDNDEnd",
         "start": {
           "column": 19,
-          "line": 135
+          "line": 136
         }
       },
       {
         "defaultMessage": "!!!Language",
         "end": {
           "column": 3,
-          "line": 142
+          "line": 143
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 139
+          "line": 140
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 146
+          "line": 147
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 143
+          "line": 144
         }
       },
       {
         "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
         "end": {
           "column": 3,
-          "line": 150
+          "line": 151
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.adaptableDarkMode",
         "start": {
           "column": 21,
-          "line": 147
+          "line": 148
         }
       },
       {
         "defaultMessage": "!!!Enable universal Dark Mode",
         "end": {
           "column": 3,
-          "line": 154
+          "line": 155
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.universalDarkMode",
         "start": {
           "column": 21,
-          "line": 151
+          "line": 152
         }
       },
       {
         "defaultMessage": "!!!Sidebar width",
         "end": {
           "column": 3,
-          "line": 158
+          "line": 159
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.serviceRibbonWidth",
         "start": {
           "column": 22,
-          "line": 155
+          "line": 156
         }
       },
       {
         "defaultMessage": "!!!Service icon size",
         "end": {
           "column": 3,
-          "line": 162
+          "line": 163
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.iconSize",
         "start": {
           "column": 12,
-          "line": 159
+          "line": 160
         }
       },
       {
         "defaultMessage": "!!!Use vertical style",
         "end": {
           "column": 3,
-          "line": 166
+          "line": 167
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.useVerticalStyle",
         "start": {
           "column": 20,
-          "line": 163
+          "line": 164
         }
       },
       {
         "defaultMessage": "!!!Always show workspace drawer",
         "end": {
           "column": 3,
-          "line": 170
+          "line": 171
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.alwaysShowWorkspaces",
         "start": {
           "column": 24,
-          "line": 167
+          "line": 168
         }
       },
       {
         "defaultMessage": "!!!Accent color",
         "end": {
           "column": 3,
-          "line": 174
+          "line": 175
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.accentColor",
         "start": {
           "column": 15,
-          "line": 171
+          "line": 172
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 178
+          "line": 179
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 175
+          "line": 176
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 182
+          "line": 183
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 179
+          "line": 180
         }
       },
       {
         "defaultMessage": "!!!Show draggable area on window",
         "end": {
           "column": 3,
-          "line": 186
+          "line": 187
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDragArea",
         "start": {
           "column": 16,
-          "line": 183
+          "line": 184
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 190
+          "line": 191
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 187
+          "line": 188
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 194
+          "line": 195
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 191
+          "line": 192
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 198
+          "line": 199
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 195
+          "line": 196
         }
       },
       {
         "defaultMessage": "!!!Enable updates",
         "end": {
           "column": 3,
-          "line": 202
+          "line": 203
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.automaticUpdates",
         "start": {
           "column": 20,
-          "line": 199
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Enable Franz Todos",
         "end": {
           "column": 3,
-          "line": 206
+          "line": 207
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableTodos",
         "start": {
           "column": 15,
-          "line": 203
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Keep all workspaces loaded",
         "end": {
           "column": 3,
-          "line": 210
+          "line": 211
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.keepAllWorkspacesLoaded",
         "start": {
           "column": 27,
-          "line": 207
+          "line": 208
         }
       }
     ],
@@ -7345,16 +7345,29 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz Professional Required",
+        "defaultMessage": "!!!User Agent",
         "end": {
           "column": 3,
           "line": 31
         },
         "file": "src/i18n/globalMessages.js",
+        "id": "global.userAgentPref",
+        "start": {
+          "column": 17,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Franz Professional Required",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/i18n/globalMessages.js",
         "id": "global.franzProRequired",
         "start": {
           "column": 15,
-          "line": 28
+          "line": 32
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 415af9a7c..14b2f5f48 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -75,6 +75,7 @@
   "global.spellchecking.autodetect.short": "Automatic",
   "global.spellchecking.language": "Spell checking language",
   "global.upgradeButton.upgradeToPro": "Upgrade to Ferdi Professional",
+  "global.userAgentPref": "User Agent",
   "import.headline": "Import your Ferdi 4 services",
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 50c73d9b1..a1e8c714e 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -395,7 +395,7 @@
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
       "line": 144,
-      "column": 29
+      "column": 22
     },
     "end": {
       "line": 147,
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index cd5462b59..d56f8cbbc 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Launch Ferdi on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 31,
+      "line": 32,
       "column": 21
     },
     "end": {
-      "line": 34,
+      "line": 35,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Open in background",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 35,
+      "line": 36,
       "column": 26
     },
     "end": {
-      "line": 38,
+      "line": 39,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Keep Ferdi in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 39,
+      "line": 40,
       "column": 19
     },
     "end": {
-      "line": 42,
+      "line": 43,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Start minimized",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 43,
+      "line": 44,
       "column": 18
     },
     "end": {
-      "line": 46,
+      "line": 47,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Always show Ferdi in System Tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 47,
+      "line": 48,
       "column": 20
     },
     "end": {
-      "line": 50,
+      "line": 51,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Always show Ferdi in Menu Bar",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 51,
+      "line": 52,
       "column": 17
     },
     "end": {
-      "line": 54,
+      "line": 55,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Reload Ferdi after system resume",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 55,
+      "line": 56,
       "column": 21
     },
     "end": {
-      "line": 58,
+      "line": 59,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Minimize Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 59,
+      "line": 60,
       "column": 24
     },
     "end": {
-      "line": 62,
+      "line": 63,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Close Ferdi to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 63,
+      "line": 64,
       "column": 21
     },
     "end": {
-      "line": 66,
+      "line": 67,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Don't show message content in notifications",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 67,
+      "line": 68,
       "column": 24
     },
     "end": {
-      "line": 70,
+      "line": 71,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Don't show notifications for clipboard events",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 71,
+      "line": 72,
       "column": 26
     },
     "end": {
-      "line": 74,
+      "line": 75,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Notify TaskBar/Dock on new message",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 75,
+      "line": 76,
       "column": 26
     },
     "end": {
-      "line": 78,
+      "line": 79,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Navigation bar behaviour",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 79,
+      "line": 80,
       "column": 26
     },
     "end": {
-      "line": 82,
+      "line": 83,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Search engine",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 83,
+      "line": 84,
       "column": 16
     },
     "end": {
-      "line": 86,
+      "line": 87,
       "column": 3
     }
   },
@@ -186,11 +186,11 @@
     "defaultMessage": "!!!Send telemetry data",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 87,
+      "line": 88,
       "column": 10
     },
     "end": {
-      "line": 90,
+      "line": 91,
       "column": 3
     }
   },
@@ -199,11 +199,11 @@
     "defaultMessage": "!!!Enable service hibernation",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 91,
+      "line": 92,
       "column": 13
     },
     "end": {
-      "line": 94,
+      "line": 95,
       "column": 3
     }
   },
@@ -212,11 +212,11 @@
     "defaultMessage": "!!!Keep services in hibernation on startup",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 95,
+      "line": 96,
       "column": 22
     },
     "end": {
-      "line": 98,
+      "line": 99,
       "column": 3
     }
   },
@@ -225,11 +225,11 @@
     "defaultMessage": "!!!Hibernation strategy",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 99,
+      "line": 100,
       "column": 23
     },
     "end": {
-      "line": 102,
+      "line": 103,
       "column": 3
     }
   },
@@ -238,11 +238,11 @@
     "defaultMessage": "!!!Todo Server",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 103,
+      "line": 104,
       "column": 24
     },
     "end": {
-      "line": 106,
+      "line": 107,
       "column": 3
     }
   },
@@ -251,11 +251,11 @@
     "defaultMessage": "!!!Custom TodoServer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 107,
+      "line": 108,
       "column": 20
     },
     "end": {
-      "line": 110,
+      "line": 111,
       "column": 3
     }
   },
@@ -264,11 +264,11 @@
     "defaultMessage": "!!!Enable Password Lock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 111,
+      "line": 112,
       "column": 14
     },
     "end": {
-      "line": 114,
+      "line": 115,
       "column": 3
     }
   },
@@ -277,11 +277,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 115,
+      "line": 116,
       "column": 16
     },
     "end": {
-      "line": 118,
+      "line": 119,
       "column": 3
     }
   },
@@ -290,11 +290,11 @@
     "defaultMessage": "!!!Allow using Touch ID to unlock",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 119,
+      "line": 120,
       "column": 22
     },
     "end": {
-      "line": 122,
+      "line": 123,
       "column": 3
     }
   },
@@ -303,11 +303,11 @@
     "defaultMessage": "!!!Lock after inactivity",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 18
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 3
     }
   },
@@ -316,11 +316,11 @@
     "defaultMessage": "!!!Enable scheduled Do-not-Disturb",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 23
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 3
     }
   },
@@ -329,11 +329,11 @@
     "defaultMessage": "!!!From",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 21
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 3
     }
   },
@@ -342,11 +342,11 @@
     "defaultMessage": "!!!To",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 135,
+      "line": 136,
       "column": 19
     },
     "end": {
-      "line": 138,
+      "line": 139,
       "column": 3
     }
   },
@@ -355,11 +355,11 @@
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 139,
+      "line": 140,
       "column": 12
     },
     "end": {
-      "line": 142,
+      "line": 143,
       "column": 3
     }
   },
@@ -368,11 +368,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 143,
+      "line": 144,
       "column": 12
     },
     "end": {
-      "line": 146,
+      "line": 147,
       "column": 3
     }
   },
@@ -381,11 +381,11 @@
     "defaultMessage": "!!!Synchronize dark mode with my OS's dark mode setting",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 147,
+      "line": 148,
       "column": 21
     },
     "end": {
-      "line": 150,
+      "line": 151,
       "column": 3
     }
   },
@@ -394,11 +394,11 @@
     "defaultMessage": "!!!Enable universal Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 151,
+      "line": 152,
       "column": 21
     },
     "end": {
-      "line": 154,
+      "line": 155,
       "column": 3
     }
   },
@@ -407,11 +407,11 @@
     "defaultMessage": "!!!Sidebar width",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 155,
+      "line": 156,
       "column": 22
     },
     "end": {
-      "line": 158,
+      "line": 159,
       "column": 3
     }
   },
@@ -420,11 +420,11 @@
     "defaultMessage": "!!!Service icon size",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 159,
+      "line": 160,
       "column": 12
     },
     "end": {
-      "line": 162,
+      "line": 163,
       "column": 3
     }
   },
@@ -433,11 +433,11 @@
     "defaultMessage": "!!!Use vertical style",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 163,
+      "line": 164,
       "column": 20
     },
     "end": {
-      "line": 166,
+      "line": 167,
       "column": 3
     }
   },
@@ -446,11 +446,11 @@
     "defaultMessage": "!!!Always show workspace drawer",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 167,
+      "line": 168,
       "column": 24
     },
     "end": {
-      "line": 170,
+      "line": 171,
       "column": 3
     }
   },
@@ -459,11 +459,11 @@
     "defaultMessage": "!!!Accent color",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 171,
+      "line": 172,
       "column": 15
     },
     "end": {
-      "line": 174,
+      "line": 175,
       "column": 3
     }
   },
@@ -472,11 +472,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 175,
+      "line": 176,
       "column": 24
     },
     "end": {
-      "line": 178,
+      "line": 179,
       "column": 3
     }
   },
@@ -485,11 +485,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 179,
+      "line": 180,
       "column": 29
     },
     "end": {
-      "line": 182,
+      "line": 183,
       "column": 3
     }
   },
@@ -498,11 +498,11 @@
     "defaultMessage": "!!!Show draggable area on window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 183,
+      "line": 184,
       "column": 16
     },
     "end": {
-      "line": 186,
+      "line": 187,
       "column": 3
     }
   },
@@ -511,11 +511,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 187,
+      "line": 188,
       "column": 23
     },
     "end": {
-      "line": 190,
+      "line": 191,
       "column": 3
     }
   },
@@ -524,11 +524,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 191,
+      "line": 192,
       "column": 25
     },
     "end": {
-      "line": 194,
+      "line": 195,
       "column": 3
     }
   },
@@ -537,11 +537,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 195,
+      "line": 196,
       "column": 8
     },
     "end": {
-      "line": 198,
+      "line": 199,
       "column": 3
     }
   },
@@ -550,11 +550,11 @@
     "defaultMessage": "!!!Enable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 199,
+      "line": 200,
       "column": 20
     },
     "end": {
-      "line": 202,
+      "line": 203,
       "column": 3
     }
   },
@@ -563,11 +563,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 203,
+      "line": 204,
       "column": 15
     },
     "end": {
-      "line": 206,
+      "line": 207,
       "column": 3
     }
   },
@@ -576,11 +576,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 207,
+      "line": 208,
       "column": 27
     },
     "end": {
-      "line": 210,
+      "line": 211,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index 903de64cb..f816a0560 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -78,15 +78,28 @@
     }
   },
   {
+    "id": "global.userAgentPref",
+    "defaultMessage": "!!!User Agent",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 28,
+      "column": 17
+    },
+    "end": {
+      "line": 31,
+      "column": 3
+    }
+  },
+  {
     "id": "global.franzProRequired",
     "defaultMessage": "!!!Franz Professional Required",
     "file": "src/i18n/globalMessages.js",
     "start": {
-      "line": 28,
+      "line": 32,
       "column": 15
     },
     "end": {
-      "line": 31,
+      "line": 35,
       "column": 3
     }
   }
diff --git a/src/models/Service.js b/src/models/Service.js
index d0c6a7103..50115f605 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -107,6 +107,8 @@ export default class Service {
       return null;
     }
 
+    this.userAgentModel = new UserAgent(recipe.overrideUserAgent);
+
     this.id = data.id || this.id;
     this.name = data.name || this.name;
     this.team = data.team || this.team;
@@ -141,6 +143,8 @@ export default class Service {
 
     this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
 
+    this.userAgentPref = data.userAgentPref !== undefined ? data.userAgentPref : this.userAgentPref;
+
     this.isHibernationEnabled = data.isHibernationEnabled !== undefined ? data.isHibernationEnabled : this.isHibernationEnabled;
 
     this.recipe = recipe;
@@ -156,8 +160,6 @@ export default class Service {
       this.isHibernating = true;
     }
 
-    this.userAgentModel = new UserAgent(recipe.overrideUserAgent);
-
     autorun(() => {
       if (!this.isEnabled) {
         this.webview = null;
@@ -243,6 +245,18 @@ export default class Service {
     return this.userAgentModel.userAgent;
   }
 
+  @computed get userAgentPref() {
+    return this.userAgentModel.userAgentPref;
+  }
+
+  set userAgentPref(pref) {
+    this.userAgentModel.userAgentPref = pref;
+  }
+
+  @computed get defaultUserAgent() {
+    return this.userAgentModel.defaultUserAgent;
+  }
+
   @computed get partition() {
     return this.recipe.partition || `persist:service-${this.id}`;
   }
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index f51f2e5a6..f1d08e306 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -18,7 +18,9 @@ export default class UserAgent {
 
   @observable chromelessUserAgent = false;
 
-  @observable getUserAgent = defaultUserAgent;
+  @observable userAgentPref = null;
+
+  @observable getUserAgent = null;
 
   constructor(overrideUserAgent = null) {
     if (typeof overrideUserAgent === 'function') {
@@ -36,8 +38,37 @@ export default class UserAgent {
     });
   }
 
+  @computed get defaultUserAgent() {
+    if (typeof this.getUserAgent === 'function') {
+      return this.getUserAgent();
+    }
+    const globalPref = window.ferdi.stores.settings.all.app.userAgentPref;
+    if (typeof globalPref === 'string') {
+      const trimmed = globalPref.trim();
+      if (trimmed !== '') {
+        return trimmed;
+      }
+    }
+    return defaultUserAgent();
+  }
+
+  @computed get userAgentWithChromeVersion() {
+    if (typeof this.userAgentPref === 'string') {
+      const trimmed = this.userAgentPref.trim();
+      if (trimmed !== '') {
+        return trimmed;
+      }
+    }
+    return this.defaultUserAgent;
+  }
+
+  @computed get userAgentWithoutChromeVersion() {
+    const withChrome = this.userAgentWithChromeVersion;
+    return withChrome.replace(/Chrome\/[0-9.]+/, 'Chrome');
+  }
+
   @computed get userAgent() {
-    return this.chromelessUserAgent ? defaultUserAgent(true) : this.getUserAgent();
+    return this.chromelessUserAgent ? this.userAgentWithoutChromeVersion : this.userAgentWithChromeVersion;
   }
 
   @action setWebviewReference(webview) {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 752f287e8..3dba217b2 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -315,6 +315,7 @@ export default class ServicesStore extends Store {
       customIcon: false,
       isDarkModeEnabled: false,
       spellcheckerLanguage: SPELLCHECKER_LOCALES[this.stores.settings.app.spellcheckerLanguage],
+      userAgentPref: '',
     }, serviceData);
 
     let data = serviceData;
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 15b0db120..b433efd45 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -320,5 +320,21 @@ export default class SettingsStore extends Store {
         },
       });
     }
+
+    if (!this.all.migration['user-agent-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          userAgentPref: DEFAULT_APP_SETTINGS.userAgentPref,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          'user-agent-settings': true,
+        },
+      });
+    }
   }
 }
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 1bd0ae63d..fd3151a96 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -216,7 +216,7 @@
 
     &::-webkit-scrollbar-thumb:window-inactive { background: none; }
     .service-flex-grid { display: flex; }
-    .service-name { flex: 1px; }
+    .service-name,.user-agent { flex: 1px; }
 
     .service-icon {
       float: right;
@@ -293,6 +293,7 @@
   .settings__help {
     color: $theme-gray-light;
     font-size: 12px;
+    font-style: italic;
     margin: -10px 0 20px 55px;;
   }