diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index f3fb5bbc..f017ad23 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -434,7 +434,7 @@ export default {
 				emoji.replaceWith(em)
 			})
 			let to = []
-			const re = /@((\w+)(@[\w.]+)?)/g
+			const re = /@(([\w-\_.]+)(@[\w-.]+)?)/g
 			let match = null
 			do {
 				match = re.exec(element.innerText)