diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index 35085f5..795c1a1 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -741,8 +741,8 @@ class Message extends FTNBase
 		// http://ftsc.org/docs/fsc-0068.001
 		// MSGID should be the basis of the source, we'll overrite our src from origin if we have it
 		$m = [];
-		if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?(@%s)?\ +#',$this->msgid,$m)) {
-			$this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : ''));
+		if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) {
+			$this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : ''));
 		}
 
 		// Parse SEEN-BY