diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
index 233b70399..9e63f7a58 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
@@ -188,6 +188,7 @@ public interface AndroidComponent
 	Thread.UncaughtExceptionHandler exceptionHandler();
 
 	SocialBackupManager socialBackupManager();
+
     DatabaseComponent databaseComponent();
 
 	void inject(SignInReminderReceiver briarService);
diff --git a/briar-android/src/main/java/org/briarproject/briar/socialbackup/AndroidSocialBackupModule.java b/briar-android/src/main/java/org/briarproject/briar/socialbackup/AndroidSocialBackupModule.java
index 183ab2720..17581ec5c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/socialbackup/AndroidSocialBackupModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/socialbackup/AndroidSocialBackupModule.java
@@ -8,6 +8,7 @@ import org.briarproject.bramble.api.sync.validation.ValidationManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.versioning.ClientVersioningManager;
 import org.briarproject.briar.android.socialbackup.DarkCrystalImpl;
+import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.socialbackup.DarkCrystal;
 import org.briarproject.briar.api.socialbackup.SocialBackupManager;
 
@@ -38,13 +39,15 @@ public class AndroidSocialBackupModule {
 			ContactManager contactManager,
 			ValidationManager validationManager,
 			ClientVersioningManager clientVersioningManager,
-			SocialBackupManagerImpl socialBackupManager) {
+			SocialBackupManagerImpl socialBackupManager,
+			ConversationManager conversationManager) {
 		lifecycleManager.registerOpenDatabaseHook(socialBackupManager);
 		contactManager.registerContactHook(socialBackupManager);
 		validationManager.registerIncomingMessageHook(CLIENT_ID,
 				MAJOR_VERSION, socialBackupManager);
 		clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
 				MINOR_VERSION, socialBackupManager);
+		conversationManager.registerConversationClient(socialBackupManager);
 		return socialBackupManager;
 	}