diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 16635f7ce244569880a6feb0d73082c0e39b4bdc..47861d06d21e4c651898d6962f4c573edb2673d8 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -73,14 +73,21 @@ public class Message extends AbstractEntity {
 	}
 
 	public Message(Conversation conversation, String body, int encryption, int status) {
-		this(java.util.UUID.randomUUID().toString(), conversation.getUuid(),
-				conversation.getContactJid().toBareJid(), null, body, System
-						.currentTimeMillis(), encryption,
-				status, TYPE_TEXT, null, null);
+		this(java.util.UUID.randomUUID().toString(),
+				conversation.getUuid(),
+				conversation.getContactJid() == null ? null : conversation.getContactJid().toBareJid(),
+				null,
+				body,
+				System.currentTimeMillis(),
+				encryption,
+				status,
+				TYPE_TEXT,
+				null,
+				null);
 		this.conversation = conversation;
 	}
 
-	public Message(final String uuid, final String conversationUUid, final Jid counterpart,
+	private Message(final String uuid, final String conversationUUid, final Jid counterpart,
 				   final Jid trueCounterpart, final String body, final long timeSent,
 				   final int encryption, final int status, final int type, final String remoteMsgId, final String relativeFilePath) {
 		this.uuid = uuid;