diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java b/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java
index e4ce080c9009b89e8259206a9967151948a9e791..43d8286036001039d3061ffb0410428633de110e 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/AndroidComponent.java
@@ -7,7 +7,6 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.api.contact.ContactExchangeTask;
 import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.contact.MailboxExchangeTask;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
@@ -76,7 +75,7 @@ public interface AndroidComponent
 
 	SettingsManager settingsManager();
 
-	MailboxExchangeTask mailboxExchangeTask();
+	ContactExchangeTask mailboxExchangeTask();
 
 	KeyAgreementTask keyAgreementTask();
 
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/MailboxExchangeActivity.java b/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/MailboxExchangeActivity.java
index f9197eb6aa540f2512ddafa9d85179331ef4bbba..23a57473531662c1c2da87854d40a4ea933f5e01 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/MailboxExchangeActivity.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/MailboxExchangeActivity.java
@@ -5,7 +5,7 @@ import android.support.annotation.UiThread;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.contact.ContactExchangeListener;
-import org.briarproject.bramble.api.contact.MailboxExchangeTask;
+import org.briarproject.bramble.api.contact.ContactExchangeTask;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.identity.Author;
@@ -42,7 +42,7 @@ public class MailboxExchangeActivity extends KeyAgreementActivity implements
 			Logger.getLogger(MailboxExchangeActivity.class.getName());
 
 	@Inject
-	volatile MailboxExchangeTask mailboxExchangeTask;
+	volatile ContactExchangeTask mailboxExchangeTask;
 	@Inject
 	volatile IdentityManager identityManager;