diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsActivity.java
index 8dd3f3c11..44917d12e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsActivity.java
@@ -2,6 +2,8 @@ package org.briarproject.briar.android.conversation;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import org.briarproject.bramble.api.contact.ContactId;
@@ -67,8 +69,17 @@ public class ConversationSettingsActivity extends BriarActivity {
 		if (item.getItemId() == android.R.id.home) {
 			onBackPressed();
 			return true;
+		} else if (item.getItemId() == R.id.action_help) {
+			// TODO: display dialog
 		}
 		return false;
 	}
 
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.help_action, menu);
+		return super.onCreateOptionsMenu(menu);
+	}
+
 }