From 8f93f9c314d1bf731eac64007f3c9459fa92de1f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Tue, 30 Dec 2014 09:36:00 +0100
Subject: [PATCH] improved fromServer filter

---
 src/main/java/eu/siacs/conversations/parser/IqParser.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index 8e14936e6..e84545fcb 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -72,7 +72,10 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 	}
 
 	public static boolean fromServer(final Account account, final IqPacket packet) {
-		return packet.getFrom() == null || packet.getFrom().equals(account.getServer()) || packet.getFrom().toBareJid().equals(account.getJid().toBareJid());
+		return packet.getFrom() == null
+				|| packet.getFrom().equals(account.getServer())
+				|| packet.getFrom().equals(account.getJid().toBareJid())
+				|| packet.getFrom().equals(account.getJid());
 	}
 
 	@Override