diff --git a/src/main/java/envoy/client/ui/ChatWindow.java b/src/main/java/envoy/client/ui/ChatWindow.java
index b839c4c..4f8b0dc 100644
--- a/src/main/java/envoy/client/ui/ChatWindow.java
+++ b/src/main/java/envoy/client/ui/ChatWindow.java
@@ -247,7 +247,9 @@ public class ChatWindow extends JFrame {
 		if (!messageEnterTextArea.getText().isEmpty()) try {
 
 			// Create message
-			final Message message = new MessageBuilder(localDB.getUser(), currentChat.getRecipient()).setText(messageEnterTextArea.getText()).build();
+			final Message message = new MessageBuilder(localDB.getUser().getId(), currentChat.getRecipient().getId())
+				.setText(messageEnterTextArea.getText())
+				.build();
 
 			// Send message
 			client.sendMessage(message);