diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java
index 8fc197788..0f8848bc5 100644
--- a/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/sharing/SharingManagerImpl.java
@@ -593,7 +593,10 @@ abstract class SharingManagerImpl<S extends Shareable>
 		for (MessageStatus status : db.getMessageStatus(txn, c, g)) {
 			if (!status.isSeen()) notAcked.add(status.getMessageId());
 		}
-		return deleteCompletedSessions(txn, sessions.values(), notAcked);
+		boolean allDeleted =
+				deleteCompletedSessions(txn, sessions.values(), notAcked);
+		recalculateGroupCount(txn, g);
+		return allDeleted;
 	}
 
 	private boolean deleteCompletedSessions(Transaction txn,
@@ -639,6 +642,31 @@ abstract class SharingManagerImpl<S extends Shareable>
 		}
 	}
 
+	private void recalculateGroupCount(Transaction txn, GroupId g)
+			throws DbException {
+		BdfDictionary query = messageParser.getMessagesVisibleInUiQuery();
+		Map<MessageId, BdfDictionary> results;
+		try {
+			results =
+					clientHelper.getMessageMetadataAsDictionary(txn, g, query);
+		} catch (FormatException e) {
+			throw new DbException(e);
+		}
+		int msgCount = 0;
+		int unreadCount = 0;
+		for (Entry<MessageId, BdfDictionary> entry : results.entrySet()) {
+			MessageMetadata meta;
+			try {
+				meta = messageParser.parseMetadata(entry.getValue());
+			} catch (FormatException e) {
+				throw new DbException(e);
+			}
+			msgCount++;
+			if (!meta.isRead()) unreadCount++;
+		}
+		messageTracker.resetGroupCount(txn, g, msgCount, unreadCount);
+	}
+
 	private static class StoredSession {
 
 		private final MessageId storageId;
diff --git a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java
index 53215f177..032f8863d 100644
--- a/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/sharing/ForumSharingIntegrationTest.java
@@ -10,6 +10,7 @@ import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
+import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.test.TestDatabaseConfigModule;
@@ -41,6 +42,7 @@ import static junit.framework.Assert.assertNotNull;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.briarproject.briar.api.forum.ForumSharingManager.CLIENT_ID;
 import static org.briarproject.briar.api.forum.ForumSharingManager.MAJOR_VERSION;
+import static org.briarproject.briar.test.BriarTestUtils.assertGroupCount;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -829,12 +831,22 @@ public class ForumSharingIntegrationTest
 		sync1To0(1, true);
 		eventWaiter.await(TIMEOUT, 1);
 
+		// check that messages are tracked properly
+		GroupId g1From0 =
+				forumSharingManager0.getContactGroup(contact1From0).getId();
+		GroupId g0From1 =
+				forumSharingManager1.getContactGroup(contact0From1).getId();
+		assertGroupCount(messageTracker0, g1From0, 2, 1);
+		assertGroupCount(messageTracker1, g0From1, 2, 1);
+
 		// 0 deletes all messages
 		assertTrue(deleteAllMessages1From0());
 		assertEquals(0, getMessages1From0().size());
+		assertGroupCount(messageTracker0, g1From0, 0, 0);
 
 		// 1 can not delete all messages, as last one has not been ACKed
 		assertFalse(deleteAllMessages0From1());
+		assertGroupCount(messageTracker1, g0From1, 2, 1);
 
 		// 0 sends an ACK to their last message
 		sendAcks(c0, c1, contactId1From0, 1);
@@ -842,6 +854,7 @@ public class ForumSharingIntegrationTest
 		// 1 can now delete all messages, as last one has been ACKed
 		assertTrue(deleteAllMessages0From1());
 		assertEquals(0, getMessages0From1().size());
+		assertGroupCount(messageTracker1, g0From1, 0, 0);
 
 		// both leave forum and send LEAVE message
 		forumManager0.removeForum(forum);
@@ -856,8 +869,10 @@ public class ForumSharingIntegrationTest
 		// messages can not be deleted anymore
 		assertFalse(deleteAllMessages1From0());
 		assertEquals(1, getMessages1From0().size());
+		assertGroupCount(messageTracker0, g1From0, 1, 1);
 		assertFalse(deleteAllMessages0From1());
 		assertEquals(1, getMessages0From1().size());
+		assertGroupCount(messageTracker1, g0From1, 1, 0);
 
 		// 0 accepts re-share
 		forumSharingManager0.respondToInvitation(forum, contact1From0, true);
@@ -869,8 +884,10 @@ public class ForumSharingIntegrationTest
 		// messages can now get deleted again
 		assertTrue(deleteAllMessages1From0());
 		assertEquals(0, getMessages1From0().size());
+		assertGroupCount(messageTracker0, g1From0, 0, 0);
 		assertTrue(deleteAllMessages0From1());
 		assertEquals(0, getMessages0From1().size());
+		assertGroupCount(messageTracker1, g0From1, 0, 0);
 	}
 
 	@Test