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 9c140a0217b8773389573974efd94632f1c7eddd..778a6f2b95c6454adaf4ddad3d174eb5239f13cb 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
@@ -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;
@@ -130,8 +129,6 @@ public interface AndroidComponent
 
 	ContactExchangeTask contactExchangeTask();
 
-	MailboxExchangeTask mailboxExchangeTask();
-
 	KeyAgreementTask keyAgreementTask();
 
 	PayloadEncoder payloadEncoder();
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java
index f2764266a174baaad1a287fb55a9485e775012c7..c22bf3383e4365b4a566f5111c7cb13a4d896a49 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/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.DbException;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.IdentityManager;
@@ -21,8 +21,8 @@ import javax.inject.Inject;
 
 import static android.widget.Toast.LENGTH_LONG;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.api.contact.ContactTypes.MAILBOX_OWNER;
-import static org.briarproject.bramble.api.contact.ContactTypes.PRIVATE_MAILBOX;
+import static org.briarproject.bramble.api.contact.ContactType.MAILBOX_OWNER;
+import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.R.string;
 
@@ -33,7 +33,7 @@ public class MailboxExchangeActivity extends KeyAgreementActivity implements
 			Logger.getLogger(MailboxExchangeActivity.class.getName());
 
 	@Inject
-	volatile MailboxExchangeTask mailboxExchangeTask;
+	volatile ContactExchangeTask contactExchangeTask;
 	@Inject
 	volatile IdentityManager identityManager;
 
@@ -61,7 +61,7 @@ public class MailboxExchangeActivity extends KeyAgreementActivity implements
 			}
 
 			// Exchange contact details
-			mailboxExchangeTask.startExchange(MailboxExchangeActivity.this,
+			contactExchangeTask.startExchange(MailboxExchangeActivity.this,
 					localAuthor, result.getMasterKey(),
 					result.getConnection(), result.getTransportId(),
 					result.wasAlice(), MAILBOX_OWNER, PRIVATE_MAILBOX);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
index 1f878c8808406e5c6ef90f0e45562e178abcaa97..3bae52a354cf74d16f6f43e0b1492631e50eff19 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java
@@ -24,7 +24,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
 
 import static android.support.v4.view.ViewCompat.setTransitionName;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.api.contact.ContactTypes.PRIVATE_MAILBOX;
+import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 public class RepeaterActivity extends BriarActivity {