diff --git a/briar b/briar
index 7536f16c6136ebd5700a0f0ad49441050cf60096..2aa39e43ef427ecf47a3e9e7a3e82884a354e56a 160000
--- a/briar
+++ b/briar
@@ -1 +1 @@
-Subproject commit 7536f16c6136ebd5700a0f0ad49441050cf60096
+Subproject commit 2aa39e43ef427ecf47a3e9e7a3e82884a354e56a
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopCoreModule.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopCoreModule.kt
index 6b5e42f68e5d58828a42da06b08851e21dc2700b..dc5a1fdd460da365a3aa487b36f98c436c469814 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopCoreModule.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/DesktopCoreModule.kt
@@ -26,6 +26,7 @@ import kotlinx.coroutines.swing.Swing
 import org.briarproject.bramble.account.AccountModule
 import org.briarproject.bramble.api.db.DatabaseConfig
 import org.briarproject.bramble.api.event.EventExecutor
+import org.briarproject.bramble.api.mailbox.MailboxDirectory
 import org.briarproject.bramble.api.plugin.PluginConfig
 import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
 import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
@@ -147,6 +148,12 @@ internal class DesktopCoreModule(
     @Singleton
     fun provideBriarExecutors(briarExecutors: BriarExecutorsImpl): BriarExecutors = briarExecutors
 
+    @Provides
+    @MailboxDirectory
+    internal fun provideMailboxDirectory(): File {
+        return appDir.resolve("mailbox").toFile()
+    }
+
     @Provides
     @TorDirectory
     internal fun provideTorDirectory(): File =