diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index b1cdb914c1..d3e767e094 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -95,7 +95,7 @@ class XMPPDaemon {
 		# Forwarded from another daemon (probably a broadcaster) for
 		# us to handle
 
-		if (preg_match('/^'.jabber_daemon_address().'/', $from)) {
+		if (preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from))) {
 			$from = $this->get_ofrom($pl);
 			if (is_null($from)) {
 				return;
diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index a82f5b9445..489ae7e7ca 100755
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -61,6 +61,9 @@ class XmppQueueHandler extends QueueHandler {
 	}
 
 	function forward_message(&$pl) {
+		if ($pl['type'] != 'chat') {
+			return;
+		}
 		$listener = $this->listener();
 		$this->log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener);
 		$this->conn->message($this->listener(), $pl['body'], 'chat', NULL, $this->ofrom($pl['from']));