diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index 162660d8f686e2c33c52f89a3b921fc21f4e2d01..57e9804f5590a6e2c3c4a13f7b3f99b905794141 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -19,7 +19,7 @@ import android.os.IBinder;
 
 public class BriarActivity extends RoboFragmentActivity {
 
-	private static final int REQUEST_PASSWORD = 1;
+	public static final int REQUEST_PASSWORD = 1;
 
 	private static final Logger LOG =
 			Logger.getLogger(BriarActivity.class.getName());
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index 57aed2a519318d1bc3b267e1eb4e29841142c414..1eee142849eac4779dc37725ccb97a1e41f92050 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -118,6 +118,10 @@ implements EventListener, OnClickListener, OnItemClickListener {
 		if(b == null) throw new IllegalStateException();
 		localAuthorId = new AuthorId(b);
 
+		Intent data = new Intent();
+		data.putExtra("briar.CONTACT_ID", id);
+		setResult(RESULT_OK, data);
+
 		LinearLayout layout = new LinearLayout(this);
 		layout.setLayoutParams(MATCH_MATCH);
 		layout.setOrientation(VERTICAL);
@@ -297,11 +301,6 @@ implements EventListener, OnClickListener, OnItemClickListener {
 	public void onPause() {
 		super.onPause();
 		db.removeListener(this);
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
 		if(isFinishing()) markMessagesRead();
 	}
 
diff --git a/briar-android/src/org/briarproject/android/groups/GroupActivity.java b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
index d4d7a64de7ac41d48199990420858adf38dcbcde..5f21731f6ceb591e01ee088256ee1504e8dda581 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
@@ -232,11 +232,6 @@ OnClickListener, OnItemClickListener {
 	public void onPause() {
 		super.onPause();
 		db.removeListener(this);
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
 		if(isFinishing()) markMessagesRead();
 	}