diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImpl.java
index fcd6c3c95..25424a216 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImpl.java
@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.client.ContactGroupFactory;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.contact.ContactManager.ContactHook;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.data.BdfDictionary;
@@ -56,7 +55,6 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
 	private final ContactGroupFactory contactGroupFactory;
 	private final Clock clock;
 	private final MailboxSettingsManager mailboxSettingsManager;
-	private final ContactManager contactManager;
 	private final CryptoComponent crypto;
 	private final Group localGroup;
 
@@ -66,7 +64,6 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
 			MetadataParser metadataParser,
 			ContactGroupFactory contactGroupFactory, Clock clock,
 			MailboxSettingsManager mailboxSettingsManager,
-			ContactManager contactManager,
 			CryptoComponent crypto) {
 		this.db = db;
 		this.clientHelper = clientHelper;
@@ -75,7 +72,6 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
 		this.contactGroupFactory = contactGroupFactory;
 		this.clock = clock;
 		this.mailboxSettingsManager = mailboxSettingsManager;
-		this.contactManager = contactManager;
 		this.crypto = crypto;
 		localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID,
 				MAJOR_VERSION);
@@ -120,14 +116,14 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
 	@Override
 	public void mailboxPaired(Transaction txn, String ownOnion)
 			throws DbException {
-		for (Contact c : contactManager.getContacts()) {
+		for (Contact c : db.getContacts(txn)) {
 			createAndSendProperties(txn, c, ownOnion);
 		}
 	}
 
 	@Override
 	public void mailboxUnpaired(Transaction txn) throws DbException {
-		for (Contact c : contactManager.getContacts()) {
+		for (Contact c : db.getContacts(txn)) {
 			sendEmptyProperties(txn, c);
 		}
 	}
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImplTest.java
index 39fe24da5..dd8825455 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImplTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImplTest.java
@@ -3,7 +3,6 @@ package org.briarproject.bramble.mailbox;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.client.ContactGroupFactory;
 import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfEntry;
@@ -68,8 +67,6 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
 	private final CryptoComponent crypto = context.mock(CryptoComponent.class);
 	private final MailboxSettingsManager mailboxSettingsManager =
 			context.mock(MailboxSettingsManager.class);
-	private final ContactManager contactManager =
-			context.mock(ContactManager.class);
 
 	private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
 	private final BdfDictionary propsDict;
@@ -99,7 +96,7 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
 		}});
 		return new MailboxPropertyManagerImpl(db, clientHelper,
 				clientVersioningManager, metadataParser, contactGroupFactory,
-				clock, mailboxSettingsManager, contactManager, crypto);
+				clock, mailboxSettingsManager, crypto);
 	}
 
 	@Test
@@ -423,7 +420,7 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
 		));
 
 		context.checking(new Expectations() {{
-			oneOf(contactManager).getContacts();
+			oneOf(db).getContacts(txn);
 			will(returnValue(contacts));
 			oneOf(crypto).generateUniqueId();
 			will(returnValue(props.getAuthToken()));
@@ -466,7 +463,7 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
 		));
 
 		context.checking(new Expectations() {{
-			oneOf(contactManager).getContacts();
+			oneOf(db).getContacts(txn);
 			will(returnValue(contacts));
 			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
 					MAJOR_VERSION, contact);