1 files changed, 8 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 43876e450..8747d51f5 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -116,6 +116,10 @@ function statusToTextMentions(state, status) {
     set = set.add(`@${status.getIn(['account', 'acct'])} `);
   }
 
+  set = set.union(status.get('tags').filter(
+    tag => tag.get('name') && tag.get('name').startsWith("chat.")
+  ).map(tag => `#${tag.get('name')} `));
+
   return set.union(status.get('mentions').filterNot(mention => mention.get('id') === me).map(mention => `@${mention.get('acct')} `)).join('');
 };
 
@@ -126,6 +130,10 @@ function apiStatusToTextMentions (state, status) {
     set = set.add(`@${status.account.acct} `);
   }
 
+  set = set.union(status.tags.filter(
+    tag => tag.name && tag.name.startsWith("chat.")
+  ).map(tag => `#${tag.name} `));
+
   return set.union(status.mentions.filter(
     mention => mention.id !== me
   ).map(