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/contact/ConversationActivity.java
index f9c9d1cb3..5dc44b907 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
@@ -203,6 +203,7 @@ public class ConversationActivity extends BriarActivity
 			if (deleted) finish();
 		});
 		viewModel.loadContact(contactId);
+		viewModel.getContactDisplayName().observe(this, name -> loadMessages());
 
 		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
 		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
@@ -243,8 +244,8 @@ public class ConversationActivity extends BriarActivity
 		notificationManager.blockContactNotification(contactId);
 		notificationManager.clearContactNotification(contactId);
 		displayContactOnlineStatus();
-		observeOnce(viewModel.getContactDisplayName(), this,
-				name -> loadMessages());
+		if (viewModel.getContactDisplayName().getValue() != null)
+			loadMessages();
 		list.startPeriodicUpdate();
 	}
 
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/contact/ConversationViewModel.java
index 1141bc23c..524c4f716 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationViewModel.java
@@ -77,7 +77,6 @@ public class ConversationViewModel extends AndroidViewModel {
 			try {
 				contactManager.setContactAlias(contactId,
 						alias.isEmpty() ? null : alias);
-				// TODO also reload the conversation
 				loadContact(contactId);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);