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 a26b47929..d8ba07e4c 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,8 +2,6 @@ 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;
@@ -71,17 +69,8 @@ public class ConversationSettingsActivity extends BriarActivity implements
 		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);
-	}
-
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
index cd3de1883..6425211f5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
@@ -3,6 +3,9 @@ package org.briarproject.briar.android.conversation;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
@@ -71,6 +74,12 @@ public class ConversationSettingsFragment extends BaseFragment {
 		listener.getActivityComponent().inject(this);
 	}
 
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setHasOptionsMenu(true);
+	}
+
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
@@ -126,4 +135,20 @@ public class ConversationSettingsFragment extends BaseFragment {
 		});
 	}
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		inflater.inflate(R.menu.help_action, menu);
+		super.onCreateOptionsMenu(menu, inflater);
+	}
+
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == R.id.action_help) {
+			// TODO: display dialog
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
 }