diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
index 26405cfd2dc11ff2594a88a546c8fd10bd2de7af..67acd561e8ed24078790b2ea7ece346c419e3b40 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxManagerImpl.java
@@ -89,7 +89,7 @@ public class MailboxManagerImpl implements MailboxManager {
 		}
 		ioExecutor.execute(
 				new ManageMailboxConnection(transportId, connection,
-						ContactType.PRIVATE_MAILBOX, contactId, null));
+						ContactType.PRIVATE_MAILBOX, contactId, contactId));
 	}
 
 	@Override
@@ -221,8 +221,7 @@ public class MailboxManagerImpl implements MailboxManager {
 		private void handleOutgoingStream()
 				throws DbException, IOException {
 			// Allocate a stream context
-			StreamContext ctx =
-					keyManager.getStreamContext(mailboxId, transportId);
+			StreamContext ctx  = keyManager.getStreamContext(mailboxId, transportId);
 
 			if (ctx == null)
 				throw new IOException("Unable to allocate stream context");
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
index 5ca81fb5bfc77bde4acf204c417519809dedee43..f6f82d598a783fb75870181cafeb984464f9fd0f 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/sessions/AbstractMailboxSession.java
@@ -295,7 +295,7 @@ public abstract class AbstractMailboxSession implements MailboxSession {
 		}
 
 		StreamContext ctx =
-				keyManager.getStreamContext(MailboxConstants.ID, tag);
+				keyManager.getStreamContext(LanTcpConstants.ID, tag);
 
 		if (ctx == null)
 			throw new IOException(