diff --git a/client/src/main/java/envoy/client/ui/controller/ChatScene.java b/client/src/main/java/envoy/client/ui/controller/ChatScene.java
index ef4e38f..574e036 100644
--- a/client/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/client/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -138,7 +138,13 @@ public final class ChatScene implements Restorable {
 		// Listen to received messages
 		eventBus.register(MessageCreationEvent.class, e -> {
 			final var message = e.get();
-			localDB.getChat(message instanceof GroupMessage ? message.getRecipientID() : message.getSenderID()).ifPresent(chat -> {
+
+			// The sender of the message is the recipient of the chat
+			// Exceptions: this user is the sender (sync) or group message (group is
+			// recipient)
+			final long recipientID = message instanceof GroupMessage || message.getSenderID() == localDB.getUser().getID() ? message.getRecipientID()
+					: message.getSenderID();
+			localDB.getChat(recipientID).ifPresent(chat -> {
 				chat.insert(message);
 				if (chat.equals(currentChat)) {
 					try {
@@ -147,8 +153,10 @@ public final class ChatScene implements Restorable {
 						logger.log(Level.WARNING, "Could not read current chat: ", e1);
 					}
 					Platform.runLater(() -> { messageList.refresh(); scrollToMessageListEnd(); });
-				} else if (message.getRecipientID() == chat.getRecipient().getID() && message.getStatus() == RECEIVED) chat.incrementUnreadAmount();
-				// Moving chat with most recent unreadMessages to the top
+					// TODO: Increment unread counter for group messages with status < RECEIVED
+				} else if (message.getSenderID() != localDB.getUser().getID() && message.getStatus() == RECEIVED) chat.incrementUnreadAmount();
+
+				// Move chat with most recent unread messages to the top
 				Platform.runLater(() -> {
 					chatList.getItems().remove(chat);
 					chatList.getItems().add(0, chat);
diff --git a/server/src/main/java/envoy/server/processors/LoginCredentialProcessor.java b/server/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
index 391dab0..598d2d4 100755
--- a/server/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
+++ b/server/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
@@ -110,8 +110,9 @@ public final class LoginCredentialProcessor implements ObjectProcessor<LoginCred
 		logger.info(user + " successfully authenticated.");
 		connectionManager.registerUser(user.getID(), socketID);
 
-		// Complete the handshake
-		writeProxy.write(socketID, user.toCommon());
+		// Change status and notify contacts about it
+		user.setStatus(ONLINE);
+		UserStatusChangeProcessor.updateUserStatus(user);
 
 		final var pendingMessages = PersistenceManager.getInstance().getPendingMessages(user, credentials.getLastSync());
 		pendingMessages.removeIf(GroupMessage.class::isInstance);
@@ -145,7 +146,7 @@ public final class LoginCredentialProcessor implements ObjectProcessor<LoginCred
 			final var gmsgCommon = gmsg.toCommon();
 
 			// Deliver the message to the user if he hasn't received it yet
-			if (gmsg.getMemberMessageStatus().get(user.getID()) == SENT) {
+			if (gmsg.getCreationDate().isAfter(credentials.getLastSync()) || gmsg.getMemberMessageStatus().get(user.getID()) == SENT) {
 				if (gmsg.getMemberMessageStatus().replace(user.getID(), RECEIVED) != RECEIVED) {
 
 					gmsg.setLastStatusChangeDate(Instant.now());
@@ -187,9 +188,8 @@ public final class LoginCredentialProcessor implements ObjectProcessor<LoginCred
 			}
 		}
 
-		// Change status and notify contacts about it
-		user.setStatus(ONLINE);
-		UserStatusChangeProcessor.updateUserStatus(user);
+		// Complete the handshake
+		writeProxy.write(socketID, user.toCommon());
 	}
 
 	@Override