diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index e8c3674736..a016486a59 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -84,6 +84,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         notificationsButton.setOnClickListener { showNotificationSettings() }
         chatsButton.setOnClickListener { showChatSettings() }
         sendInvitationButton.setOnClickListener { sendInvitation() }
+        faqButton.setOnClickListener { showFAQ() }
         helpTranslateButton.setOnClickListener { helpTranslate() }
         seedButton.setOnClickListener { showSeed() }
         clearAllDataButton.setOnClickListener { clearAllData() }
@@ -224,7 +225,6 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
             return false
         }
-//        isEditingDisplayName = false
         displayNameToBeUploaded = displayName
         updateProfile(false)
         return true
@@ -238,11 +238,11 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     private fun showEditProfilePictureUI() {
         // Ask for an optional camera permission.
         Permissions.with(this)
-                .request(Manifest.permission.CAMERA)
-                .onAnyResult {
-                    tempFile = AvatarSelection.startAvatarSelection(this, false, true)
-                }
-                .execute()
+            .request(Manifest.permission.CAMERA)
+            .onAnyResult {
+                tempFile = AvatarSelection.startAvatarSelection(this, false, true)
+            }
+            .execute()
     }
 
     private fun copyPublicKey() {
@@ -286,6 +286,16 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         startActivity(chooser)
     }
 
+    private fun showFAQ() {
+        try {
+            val url = "https://getsession.org/faq"
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            startActivity(intent)
+        } catch (e: Exception) {
+            Toast.makeText(this, "Can't open URL", Toast.LENGTH_LONG).show()
+        }
+    }
+
     private fun helpTranslate() {
         try {
             val url = "https://crowdin.com/project/session-android"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f562538791..0e8bf779ff 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -202,6 +202,17 @@
                 android:gravity="center"
                 android:text="@string/activity_settings_invite_button_title" />
 
+            <TextView
+                android:id="@+id/faqButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/medium_spacing"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="@string/activity_settings_faq_button_title" />
+
             <TextView
                 android:id="@+id/helpTranslateButton"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 540fece291..8732f5674c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -755,6 +755,7 @@
     <string name="activity_settings_chats_button_title">Chats</string>
     <string name="activity_settings_devices_button_title">Devices</string>
     <string name="activity_settings_invite_button_title">Invite</string>
+    <string name="activity_settings_faq_button_title">FAQ</string>
     <string name="activity_settings_recovery_phrase_button_title">Recovery Phrase</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>