diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 2cc2b9d688..3e3f12e15e 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -967,6 +967,24 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     }
 
     private void onMenuIssue() {
+        new DialogBuilderLifecycle(this, this)
+                .setMessage(R.string.title_issue_type)
+                .setPositiveButton(R.string.title_issue_question, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        Helper.view(ActivityView.this, ActivityView.this, Helper.getIntentFAQ());
+                    }
+                })
+                .setNegativeButton(R.string.title_issue_problem, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        onReportIssue();
+                    }
+                })
+                .show();
+    }
+
+    void onReportIssue() {
         try {
             String version = BuildConfig.VERSION_NAME + "/" +
                     (Helper.hasValidFingerprint(this) ? "1" : "3") +
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d501283070..3f0947da57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,6 +81,10 @@
     <string name="menu_rate">Rate this app</string>
     <string name="menu_other">Other apps</string>
 
+    <string name="title_issue_type">Do you have a question or problem?</string>
+    <string name="title_issue_question">Question</string>
+    <string name="title_issue_problem">Problem</string>
+
     <string name="title_welcome">Welcome</string>
     <string name="title_eula">End-user license agreement</string>
     <string name="title_agree">I agree</string>