diff --git a/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java b/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
index d2065fe..80cf215 100644
--- a/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
+++ b/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
@@ -27,17 +27,15 @@ public final class MessageListCell extends AbstractListCell<Message, MessageCont
 	@Override
 	protected MessageControl renderItem(Message message) {
 		final var control = new MessageControl(message);
-		listView.widthProperty().addListener((observable, oldValue, newValue) -> adjustPadding(newValue.intValue()));
-		adjustPadding((int) listView.getWidth());
+		listView.widthProperty().addListener((observable, oldValue, newValue) -> adjustPadding(newValue.intValue(), control.isOwnMessage()));
+		adjustPadding((int) listView.getWidth(), control.isOwnMessage());
 		if (control.isOwnMessage()) setAlignment(Pos.CENTER_RIGHT);
 		else setAlignment(Pos.CENTER_LEFT);
 		return control;
 	}
 
-	private void adjustPadding(int listWidth) {
-		int padding = 0;
-		if (listWidth > 1020) padding = (listWidth - 1000) / 2;
-		else padding = 10;
-		setPadding(new Insets(0, padding, 6, padding));
+	private void adjustPadding(int listWidth, boolean ownMessage) {
+		int padding = 10 + Math.max((listWidth - 1000) / 2, 0);
+		setPadding(ownMessage ? new Insets(0, padding, 6, 0) : new Insets(0, 0, 6, padding));
 	}
 }