diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index b5a63032d..7cf1026e1 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -102,7 +102,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.contact.ConversationActivity"
+			android:name="org.briarproject.briar.android.conversation.ConversationActivity"
 			android:label="@string/app_name"
 			android:theme="@style/BriarTheme.NoActionBar"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
@@ -190,10 +190,10 @@
 		<activity
 			android:name="org.briarproject.briar.android.sharing.BlogInvitationActivity"
 			android:label="@string/blogs_sharing_invitations_title"
-			android:parentActivityName="org.briarproject.briar.android.contact.ConversationActivity">
+			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.contact.ConversationActivity"
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity"
 				/>
 		</activity>
 
@@ -327,11 +327,11 @@
 		<activity
 			android:name="org.briarproject.briar.android.introduction.IntroductionActivity"
 			android:label="@string/introduction_activity_title"
-			android:parentActivityName="org.briarproject.briar.android.contact.ConversationActivity"
+			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
 			android:windowSoftInputMode="stateHidden|adjustResize">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.contact.ConversationActivity"
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity"
 				/>
 		</activity>
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
index aacd95ffb..21af7d4f5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
@@ -31,7 +31,7 @@ import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.contact.ConversationActivity;
+import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
@@ -72,7 +72,7 @@ import static android.support.v4.app.NotificationCompat.PRIORITY_MIN;
 import static android.support.v4.app.NotificationCompat.VISIBILITY_SECRET;
 import static android.support.v4.content.ContextCompat.getColor;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
-import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID;
+import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_BLOGS;
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_CONTACTS;
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_FORUMS;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index 00feafdaf..0fe5705db 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -15,10 +15,10 @@ import org.briarproject.briar.android.blog.ReblogFragment;
 import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
-import org.briarproject.briar.android.contact.AliasDialogFragment;
+import org.briarproject.briar.android.conversation.AliasDialogFragment;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.ContactModule;
-import org.briarproject.briar.android.contact.ConversationActivity;
+import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 497da8b85..bbf1a3fd2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -31,6 +31,7 @@ import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
+import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
 import org.briarproject.briar.android.view.BriarRecyclerView;
@@ -54,7 +55,7 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID;
+import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
similarity index 97%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
index e4e0f644d..b5d446e71 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/AliasDialogFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
similarity index 99%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index 8fe29cbe6..8a166b1d5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProvider;
@@ -51,8 +51,8 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.blog.BlogActivity;
-import org.briarproject.briar.android.contact.ConversationAdapter.ConversationListener;
-import org.briarproject.briar.android.contact.ConversationVisitor.TextCache;
+import org.briarproject.briar.android.conversation.ConversationAdapter.ConversationListener;
+import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationAdapter.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
index 6bb414ad6..1d1dad150 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.content.Context;
 import android.support.annotation.LayoutRes;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java
index bfd724dff..922fc218c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.LayoutRes;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItemViewHolder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java
index 596b9adf7..05f420bb2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItemViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.CallSuper;
 import android.support.annotation.UiThread;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageInItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageInItem.java
similarity index 92%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageInItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageInItem.java
index 4022f2f68..db7479307 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageInItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageInItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.LayoutRes;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutItem.java
similarity index 92%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutItem.java
index 082071c23..1b0e7b965 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.LayoutRes;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutViewHolder.java
similarity index 81%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutViewHolder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutViewHolder.java
index 6c119a6c5..7598ca44a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationMessageOutViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutViewHolder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.view.View;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInItem.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInItem.java
index c8a5a10f1..85e224747 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.LayoutRes;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInViewHolder.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInViewHolder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInViewHolder.java
index 7ea6e93e8..43b2074dc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInViewHolder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.UiThread;
 import android.view.View;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutItem.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutItem.java
index 8275a13f5..2bccf8be3 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.LayoutRes;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutViewHolder.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutViewHolder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutViewHolder.java
index 90962b8ed..c582b945b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutViewHolder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.UiThread;
 import android.view.View;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItem.java
similarity index 94%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItem.java
index e2aff0e34..a5a9355ad 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItemViewHolder.java
similarity index 95%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItemViewHolder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItemViewHolder.java
index 39fa86887..d3eacc667 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationOutItemViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItemViewHolder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.UiThread;
 import android.view.View;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java
similarity index 97%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java
index b426f1480..8e7397036 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.LayoutRes;
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java
similarity index 91%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestViewHolder.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java
index b3f53a74f..ddb10fb36 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.support.annotation.UiThread;
 import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.Button;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.contact.ConversationAdapter.ConversationListener;
+import org.briarproject.briar.android.conversation.ConversationAdapter.ConversationListener;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
similarity index 98%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
index 95fd3a45b..684fadf45 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationVisitor.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
similarity index 94%
rename from briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationVisitor.java
rename to briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
index 62f73cf43..f9598b629 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationVisitor.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.contact;
+package org.briarproject.briar.android.conversation;
 
 import android.arch.lifecycle.LiveData;
 import android.content.Context;
@@ -20,10 +20,10 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRespons
 
 import javax.annotation.Nullable;
 
-import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.BLOG;
-import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.FORUM;
-import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.GROUP;
-import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.INTRODUCTION;
+import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.BLOG;
+import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.FORUM;
+import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.GROUP;
+import static org.briarproject.briar.android.conversation.ConversationRequestItem.RequestType.INTRODUCTION;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
index b1ae66018..a438daf3e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
@@ -30,7 +30,7 @@ import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID;
+import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
 public class ContactChooserFragment extends BaseFragment {
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionActivity.java
index 0f20cec68..137d0c585 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionActivity.java
@@ -9,7 +9,7 @@ import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
 
-import static org.briarproject.briar.android.contact.ConversationActivity.CONTACT_ID;
+import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
 public class IntroductionActivity extends BriarActivity
 		implements BaseFragmentListener {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
index 15edbed90..c7ded4cab 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java
@@ -3,7 +3,7 @@ package org.briarproject.briar.android.viewmodel;
 import android.arch.lifecycle.ViewModel;
 import android.arch.lifecycle.ViewModelProvider;
 
-import org.briarproject.briar.android.contact.ConversationViewModel;
+import org.briarproject.briar.android.conversation.ConversationViewModel;
 
 import javax.inject.Singleton;
 
diff --git a/briar-android/src/main/res/layout/activity_conversation.xml b/briar-android/src/main/res/layout/activity_conversation.xml
index 06c053128..02b0e6ab2 100644
--- a/briar-android/src/main/res/layout/activity_conversation.xml
+++ b/briar-android/src/main/res/layout/activity_conversation.xml
@@ -6,7 +6,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical"
-	tools:context=".android.contact.ConversationActivity">
+	tools:context=".android.conversation.ConversationActivity">
 
 	<android.support.design.widget.AppBarLayout
 		android:layout_width="match_parent"