diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml
index 1a3f90e4a2..1c013da621 100644
--- a/res/menu/text_secure_normal.xml
+++ b/res/menu/text_secure_normal.xml
@@ -19,4 +19,7 @@
     <item android:title="@string/text_secure_normal__menu_settings"
           android:id="@+id/menu_settings" />
 
+    <item android:title="@string/text_secure_normal__help"
+          android:id="@+id/menu_help"/>
+
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a80e8d0cc7..e23c5e465c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -657,8 +657,16 @@
     <string name="country_selection_fragment__loading_countries">Loading countries...</string>
     <string name="country_selection_fragment__search">Search</string>
 
+    <!-- device_add_fragment -->
+    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan the QR code displayed on the device to link</string>
+
+    <!-- device_link_fragment -->
+    <string name="device_link_fragment__link_device">Link device</string>
+
     <!-- device_list_fragment -->
     <string name="device_list_fragment__no_devices_linked">No devices linked...</string>
+    <string name="device_list_fragment__link_new_device">Link new device</string>
+
 
     <!-- experience_upgrade_activity -->
     <string name="experience_upgrade_activity__continue">continue</string>
@@ -1094,6 +1102,7 @@
     <string name="text_secure_normal__menu_clear_passphrase">Lock</string>
     <string name="text_secure_normal__mark_all_as_read">Mark all read</string>
     <string name="text_secure_normal__invite_friends">Invite friends</string>
+    <string name="text_secure_normal__help">Help</string>
 
     <!-- reminder_header -->
     <string name="reminder_header_expired_build">Your build of Signal has expired!</string>
@@ -1141,9 +1150,6 @@
 
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
-    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan the QR code displayed on the device to link</string>
-    <string name="device_link_fragment__link_device">Link device</string>
-    <string name="device_list_fragment__link_new_device">Link new device</string>
 
     <!-- EOF -->
 
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 13ffdffe65..0428eb4ff1 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.database.ContentObserver;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.ContactsContract;
@@ -152,6 +153,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     case R.id.menu_mark_all_read:     handleMarkAllRead();     return true;
     case R.id.menu_import_export:     handleImportExport();    return true;
     case R.id.menu_invite:            handleInvite();          return true;
+    case R.id.menu_help:              handleHelp();            return true;
     }
 
     return false;
@@ -207,6 +209,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     startActivity(new Intent(this, InviteActivity.class));
   }
 
+  private void handleHelp() {
+    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://support.whispersystems.org")));
+  }
+
   private void initializeContactUpdatesReceiver() {
     observer = new ContentObserver(null) {
       @Override