2 files changed, 49 insertions, 4 deletions

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) {