@@ -27,6 +27,8 @@ public class Chat implements Serializable {
 
 	protected int unreadAmount;
 
+	private boolean disabled;

@@ -57,2 +59,3 @@
 	@Override
-	public String toString() { return String.format("%s[recipient=%s,messages=%d]", getClass().getSimpleName(), recipient, messages.size()); }
+	public String toString() {
+		return String.format("%s[recipient=%s,messages=%d, disabled=%b]", getClass().getSimpleName(), recipient, messages.size(), disabled);

@@ -170,1 +174,4 @@
 	public void lastWritingEventWasNow() { lastWritingEvent = System.currentTimeMillis(); }
+
+	/**
+	 * Determines whether messages can be sent in this chat. Should be true i.e. for

@@ -171,0 +177,4 @@
+	 * Determines whether messages can be sent in this chat. Should be true i.e. for
+	 * chats whose recipient deleted this client as a contact.
+	 *
+	 * @return whether this {@code Chat} has been disabled

@@ -171,0 +186,4 @@
+	 * Determines whether messages can be sent in this chat. Should be true i.e. for
+	 * chats whose recipient deleted this client as a contact.
+	 *
+	 * @param disabled the disabled to set

@@ -40,2 +44,4 @@
 	private CacheMap				cacheMap	= new CacheMap();
 	private String					authToken;
+	private boolean					contactsChanged;
+	private Stream<Chat>			changedChats;

@@ -139,1 +145,3 @@
-			chats		= FXCollections.observableList((List<Chat>) in.readObject());
+			chats = FXCollections.observableList((List<Chat>) in.readObject());
+
+			// Some chats have changed and should not be overridden by the saved values

@@ -140,0 +148,4 @@
+			if (changedChats != null) {
+				changedChats.forEach(chat -> {
+					final var chatIndex = chats.indexOf(chat);
+					if (chatIndex == -1) return;

@@ -198,3 +216,3 @@
 	@Event(eventType = EnvoyCloseEvent.class, priority = 1000)
 	private synchronized void save() {
-		EnvoyLog.getLogger(LocalDB.class).log(Level.INFO, "Saving local database...");
+		EnvoyLog.getLogger(LocalDB.class).log(Level.FINER, "Saving local database...");

@@ -243,0 +263,4 @@
+		final var eventUser = operation.get();
+		switch (operation.getOperationType()) {
+			case ADD:
+				getUsers().put(eventUser.getName(), eventUser);

@@ -297,2 +340,4 @@
 	private void onOwnStatusChange(OwnStatusChange statusChange) { user.setStatus(statusChange.get()); }
 
+	@Event(eventType = ContactsChangedSinceLastLogin.class, priority = 500)
+	private void onContactsChangedSinceLastLogin() { if (user != null) contactsChanged = true; }

@@ -326,0 +375,4 @@
+	 * case they might have been deleted.
+	 *
+	 * @param user the user to set
+	 * @since Envoy Client v0.2-alpha

@@ -326,0 +385,4 @@
+			// Mark chats as disabled if a contact is no longer in this users contact list
+			final var changedUserChats = chats.stream()
+				.filter(not(chat -> contacts.contains(chat.getRecipient())))
+				.peek(chat -> { chat.setDisabled(true); logger.log(Level.INFO, String.format("Marked %s as blocked.", chat.getRecipient())); });

@@ -29,6 +30,7 @@ public final class Client implements EventListener, Closeable {
 	private Socket		socket;
 	private Receiver	receiver;
 	private boolean		online;
+	private boolean		isHandShake;

@@ -97,2 +101,3 @@
 
-			if (System.currentTimeMillis() - start > 5000) throw new TimeoutException("Did not log in after 5 seconds");
+			if (System.currentTimeMillis() - start > 5000) {
+				isHandShake = false;

@@ -178,0 +188,4 @@
+	}
+
+	@Event(eventType = ContactsChangedSinceLastLogin.class, priority = 1000)
+	private void onContactsChangedSinceLastLogin() {

@@ -17,3 +18,3 @@
  * @since Envoy Client v0.1-beta
  */
-public final class ChatControl extends HBox {
+public final class ChatControl extends Label {

@@ -18,2 +18,3 @@
 	 */
-	public GroupSizeLabel(Group recipient) { super(recipient.getContacts().size() + " members"); }
+	public GroupSizeLabel(Group recipient) {
+		super(recipient.getContacts().size() + " member" + (recipient.getContacts().size() != 1 ? "s" : ""));

@@ -284,2 +270,2 @@
-				break;
-		}
+	private void onUserOperation(UserOperation operation) {
+		// All ADD dependant logic resides in LocalDB

@@ -286,0 +274,4 @@
+
+	@Event
+	private void onGroupResize(GroupResize resize) {
+		final var chatFound = localDB.getChat(resize.getGroupID());

@@ -301,2 +302,2 @@
-	@Event
-	private void onGroupCreationResult(GroupCreationResult result) { Platform.runLater(() -> newGroupButton.setDisable(!result.get())); }
+	@Event(priority = 150)
+	private void onGroupCreationResult(GroupCreationResult result) { Platform.runLater(() -> newGroupButton.setDisable(result.get() == null)); }

@@ -332,3 +332,3 @@
 	@FXML
 	private void chatListClicked() {
-		if (chatList.getSelectionModel().isEmpty()) return;
+		if (currentChat != null && chatList.getSelectionModel().isEmpty()) return;

@@ -375,2 +381,4 @@
 				topBarStatusLabel.setText(status);
+				topBarStatusLabel.getStyleClass().clear();
 				topBarStatusLabel.getStyleClass().add(status.toLowerCase());
+				topBarStatusLabel.setVisible(true);

@@ -390,1 +399,4 @@
 			messageSearchButton.setVisible(true);
+
+			// Change the background of the message list if the chat is disabled
+			if (currentChat.isDisabled()) messageList.getStyleClass().add("disabled-chat");

@@ -738,0 +794,4 @@
+		recipientProfilePic.setImage(null);
+
+		// It is a valid case that cancel can cause a NullPointerException
+		try {

@@ -62,0 +94,4 @@
+					logger.log(Level.INFO, "The user left a group.");
+				}
+				final var controller = context.getSceneContext().getController();
+				if (controller instanceof ChatScene) ((ChatScene) controller).disableChat(block, true);

@@ -106,3 +106,3 @@
 		}
 		try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(file))) {
-			for (var obj : objs)
+			for (final var obj : objs)