1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 6f076e01..65f776ff 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -38,7 +38,7 @@ public class MessageGenerator extends AbstractGenerator {
 			packet.setTo(message.getCounterpart().toBareJid());
 			packet.setType(MessagePacket.TYPE_GROUPCHAT);
 		}
-		packet.setFrom(account.getFullJid());
+		packet.setFrom(account.getJid());
 		packet.setId(message.getUuid());
 		if (addDelay) {
 			addDelay(packet, message.getTimeSent());
@@ -124,7 +124,7 @@ public class MessageGenerator extends AbstractGenerator {
 		MessagePacket packet = new MessagePacket();
 		packet.setType(MessagePacket.TYPE_NORMAL);
 		packet.setTo(to);
-		packet.setFrom(account.getFullJid());
+		packet.setFrom(account.getJid());
 		Element received = packet.addChild("displayed",
 				"urn:xmpp:chat-markers:0");
 		received.setAttribute("id", id);
@@ -139,7 +139,7 @@ public class MessageGenerator extends AbstractGenerator {
 		Element subjectChild = new Element("subject");
 		subjectChild.setContent(subject);
 		packet.addChild(subjectChild);
-		packet.setFrom(conversation.getAccount().getJid());
+		packet.setFrom(conversation.getAccount().getJid().toBareJid());
 		return packet;
 	}
 
@@ -147,7 +147,7 @@ public class MessageGenerator extends AbstractGenerator {
 		MessagePacket packet = new MessagePacket();
 		packet.setType(MessagePacket.TYPE_NORMAL);
 		packet.setTo(contact);
-		packet.setFrom(conversation.getAccount().getFullJid());
+		packet.setFrom(conversation.getAccount().getJid());
 		Element x = packet.addChild("x", "jabber:x:conference");
 		x.setAttribute("jid", conversation.getContactJid().toBareJid().toString());
 		return packet;
@@ -156,7 +156,7 @@ public class MessageGenerator extends AbstractGenerator {
 	public MessagePacket invite(Conversation conversation, String contact) {
 		MessagePacket packet = new MessagePacket();
 		packet.setTo(conversation.getContactJid().toBareJid());
-		packet.setFrom(conversation.getAccount().getFullJid());
+		packet.setFrom(conversation.getAccount().getJid());
 		Element x = new Element("x");
 		x.setAttribute("xmlns", "http://jabber.org/protocol/muc#user");
 		Element invite = new Element("invite");
@@ -171,7 +171,7 @@ public class MessageGenerator extends AbstractGenerator {
 		MessagePacket receivedPacket = new MessagePacket();
 		receivedPacket.setType(MessagePacket.TYPE_NORMAL);
         receivedPacket.setTo(originalMessage.getFrom());
-		receivedPacket.setFrom(account.getFullJid());
+		receivedPacket.setFrom(account.getJid());
 		Element received = receivedPacket.addChild("received", namespace);
 		received.setAttribute("id", originalMessage.getId());
 		return receivedPacket;