1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
index 7bc39dc2e..7c1caae04 100644
--- a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java
@@ -45,7 +45,7 @@ public class MessageGenerator extends AbstractGenerator {
             if (this.mXmppConnectionService.indicateReceived() && !isWithSelf) {
                 packet.addChild("request", "urn:xmpp:receipts");
             }
-        } else if (message.getType() == Message.TYPE_PRIVATE) { //TODO files and images might be private as well
+        } else if (message.isPrivateMessage()) {
             packet.setTo(message.getCounterpart());
             packet.setType(MessagePacket.TYPE_CHAT);
             packet.addChild("x", "http://jabber.org/protocol/muc#user");
@@ -56,7 +56,7 @@ public class MessageGenerator extends AbstractGenerator {
             packet.setTo(message.getCounterpart().asBareJid());
             packet.setType(MessagePacket.TYPE_GROUPCHAT);
         }
-        if (conversation.isSingleOrPrivateAndNonAnonymous() && message.getType() != Message.TYPE_PRIVATE) {
+        if (conversation.isSingleOrPrivateAndNonAnonymous() && !message.isPrivateMessage()) {
             packet.addChild("markable", "urn:xmpp:chat-markers:0");
         }
         packet.setFrom(account.getJid());