diff --git a/src/main/java/envoy/client/ui/ChatWindow.java b/src/main/java/envoy/client/ui/ChatWindow.java
index 289fdd6..591be9f 100644
--- a/src/main/java/envoy/client/ui/ChatWindow.java
+++ b/src/main/java/envoy/client/ui/ChatWindow.java
@@ -14,7 +14,7 @@ import envoy.client.event.ThemeChangeEvent;
 import envoy.client.ui.settings.SettingsScreen;
 import envoy.client.util.EnvoyLog;
 import envoy.data.Message;
-import envoy.data.TextMessage;
+import envoy.data.MessageBuilder;
 import envoy.data.User;
 import envoy.event.EventBus;
 
@@ -247,7 +247,7 @@ public class ChatWindow extends JFrame {
 		if (!messageEnterTextArea.getText().isEmpty()) try {
 
 			// Create and send message object
-			final Message message = new TextMessage(0, localDB.getUser(), currentChat.getRecipient(), messageEnterTextArea.getText());
+			final Message message = new MessageBuilder(localDB.getUser(), currentChat.getRecipient()).setText(messageEnterTextArea.getText()).build();
 			currentChat.appendMessage(message);
 			messageList.setModel(currentChat.getModel());
 
diff --git a/src/main/java/envoy/client/ui/MessageListRenderer.java b/src/main/java/envoy/client/ui/MessageListRenderer.java
index 967b1cc..33f36f9 100644
--- a/src/main/java/envoy/client/ui/MessageListRenderer.java
+++ b/src/main/java/envoy/client/ui/MessageListRenderer.java
@@ -9,7 +9,6 @@ import javax.swing.ListCellRenderer;
 
 import envoy.client.Settings;
 import envoy.data.Message;
-import envoy.data.TextMessage;
 
 /**
  * Defines how a message is displayed.<br>
@@ -38,12 +37,11 @@ public class MessageListRenderer extends JLabel implements ListCellRenderer<Mess
 
 		setOpaque(true);
 
-		// TODO: Handle other message types
-		final TextMessage message = (TextMessage) value;
+		// TODO: Handle message attachments
 
-		final String	text	= message.getContent();
-		final String	state	= message.getStatus().toString();
-		final String	date	= new SimpleDateFormat("dd.MM.yyyy HH.mm").format(message.getDate());
+		final String	text	= value.getText();
+		final String	state	= value.getStatus().toString();
+		final String	date	= new SimpleDateFormat("dd.MM.yyyy HH.mm").format(value.getDate());
 
 		// Getting the MessageColor in the Chat of the current theme
 		String textColor = Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getMessageColorChat().toHex();
diff --git a/src/main/java/envoy/client/ui/StatusTrayIcon.java b/src/main/java/envoy/client/ui/StatusTrayIcon.java
index a403799..0cfda6a 100644
--- a/src/main/java/envoy/client/ui/StatusTrayIcon.java
+++ b/src/main/java/envoy/client/ui/StatusTrayIcon.java
@@ -7,7 +7,6 @@ import java.awt.event.WindowEvent;
 
 import envoy.client.event.MessageCreationEvent;
 import envoy.data.Message;
-import envoy.data.TextMessage;
 import envoy.event.EventBus;
 import envoy.exception.EnvoyException;
 
@@ -79,9 +78,8 @@ public class StatusTrayIcon {
 			.register(MessageCreationEvent.class,
 					(evt) -> {
 						// TODO: Handle other message types
-						if (displayMessages) trayIcon.displayMessage("New message received",
-								((TextMessage) ((MessageCreationEvent) evt).get()).getContent(),
-								MessageType.INFO);
+						if (displayMessages)
+							trayIcon.displayMessage("New message received", ((MessageCreationEvent) evt).get().getText(), MessageType.INFO);
 					});
 	}
 
@@ -99,4 +97,4 @@ public class StatusTrayIcon {
 			throw new EnvoyException("Could not attach Envoy tray icon to system tray.", e);
 		}
 	}
-}
+}
\ No newline at end of file