diff --git a/src/main/java/envoy/client/ui/listcell/MessageControl.java b/src/main/java/envoy/client/ui/listcell/MessageControl.java
index d68acdd..a2632e8 100644
--- a/src/main/java/envoy/client/ui/listcell/MessageControl.java
+++ b/src/main/java/envoy/client/ui/listcell/MessageControl.java
@@ -42,12 +42,14 @@ public class MessageControl extends VBox {
 		textLabel.setWrapText(true);
 		getChildren().add(textLabel);
 		// Setting the message status icon and background color
-		if (message.getRecipientID() != client.getID()) {
+		if (message.getSenderID() == client.getID()) {
 			final var statusIcon = new ImageView(statusImages.get(message.getStatus()));
 			statusIcon.setPreserveRatio(true);
 			getChildren().add(statusIcon);
 			getStyleClass().add("own-message");
-		} else getStyleClass().add("received-message");
+		} else {
+			getStyleClass().add("received-message");
+		}
 		// Adjusting height and weight of the cell to the corresponding ListView
 		paddingProperty().setValue(new Insets(5, 20, 5, 20));
 	}