1 files changed, 23 insertions, 1 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4f7ad7442..926ee36f0 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -82,6 +82,7 @@ export default class ServicesStore extends Store {
     this.actions.service.setUnreadMessageCount.listen(
       this._setUnreadMessageCount.bind(this),
     );
+    this.actions.service.setDialogTitle.listen(this._setDialogTitle.bind(this));
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
@@ -646,6 +647,12 @@ export default class ServicesStore extends Store {
     service.unreadIndirectMessageCount = count.indirect;
   }
 
+  @action _setDialogTitle({ serviceId, dialogTitle }) {
+    const service = this.one(serviceId);
+
+    service.dialogTitle = dialogTitle;
+  }
+
   @action _setWebviewReference({ serviceId, webview }) {
     const service = this.one(serviceId);
 
@@ -683,6 +690,9 @@ export default class ServicesStore extends Store {
       // TODO: add checks to not focus service when router path is /settings or /auth
       const service = this.active;
       if (service) {
+        document.title = `Ferdi - ${service.name} ${
+          service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+        } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
         this._focusService({ serviceId: service.id });
         if (this.stores.settings.app.splitMode && !focusEvent) {
           setTimeout(() => {
@@ -741,6 +751,16 @@ export default class ServicesStore extends Store {
 
         break;
       }
+      case 'active-dialog-title': {
+        debug(`Received active dialog title from '${serviceId}'`, args[0]);
+
+        this.actions.service.setDialogTitle({
+          serviceId,
+          dialogTitle: args[0],
+        });
+
+        break;
+      }
       case 'notification': {
         const { options } = args[0];
 
@@ -1063,7 +1083,9 @@ export default class ServicesStore extends Store {
     const service = this.active;
     if (service) {
       this.actions.service.focusService({ serviceId: service.id });
-      document.title = `Ferdi - ${service.name}`;
+      document.title = `Ferdi - ${service.name} ${
+        service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+      } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
     } else {
       debug('No service is active');
     }