build v3.3.1v3.3.1

1 files changed, 2 insertions, 2 deletions

diff --git a/build/lib/stanzahandlers/message.php b/build/lib/stanzahandlers/message.php
index d5f203e..d3c5727 100644
--- a/build/lib/stanzahandlers/message.php
+++ b/build/lib/stanzahandlers/message.php
@@ -54,7 +54,7 @@ class Message extends StanzaHandler
 	public function handle(array $stanza)
 	{
 		$to = $this->getAttribute($stanza, 'to');
-		$pos = strpos($to, '@');
+		$pos = strrpos($to, '@');
 		$this->to = substr($to, 0, $pos);
 		foreach ($stanza['value'] as $keyRaw => $value) {
 			// remove namespace from key as it is unneeded and cause problems
@@ -73,7 +73,7 @@ class Message extends StanzaHandler
 
 		$message = new MessageEntity();
 		$message->setTo($this->to);
-		$message->setFrom($this->from);
+		$message->setFrom($this->userId);
 		$message->setValue($this->values);
 		$message->setType($this->type);
 		$this->messageMapper->insert($message);