diff --git a/app/Listeners/EchomailListener.php b/app/Listeners/EchomailListener.php
index 138f9ed..d4d2e71 100644
--- a/app/Listeners/EchomailListener.php
+++ b/app/Listeners/EchomailListener.php
@@ -29,7 +29,7 @@ class EchomailListener implements ShouldQueue
 		$ea = $event->eo->echoarea;
 
 		// Catch our messages that we've posted, so they dont go back
-		if (str_ends_with($event->eo->from,':'.config('matrix.server')))
+		if (preg_match('/^@.+:/',$event->eo->from))
 			return;
 
 		if ($ea && collect(config('matrix.rooms'))->contains($ea->name)) {