diff --git a/FAQ.md b/FAQ.md
index d491b5ad64..426720bbb9 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -280,6 +280,7 @@ Fonts, sizes, colors, etc should be material design whenever possible.
 * [(155) What is a winmail.dat file?](#user-content-faq155)
 * [(156) How can I set up an Office365 account?](#user-content-faq156)
 * [(157) How can I set up an Free.fr account?](#user-content-faq157)
+* [(158) Which camera / audio recorder do you recommend?](#user-content-faq158)
 
 [I have another question.](#user-content-support)
 
@@ -3084,6 +3085,13 @@ Veuillez [voir ici](http://jc.etiemble.free.fr/abc/index.php/trucs-astuces/confi
 
 <br />
 
+<a name="faq158"></a>
+**(158) Which camera / audio recorder do you recommend**
+
+* [Open Camera](https://play.google.com/store/apps/details?id=net.sourceforge.opencamera) [F-Droid](https://f-droid.org/en/packages/net.sourceforge.opencamera/)
+* [Audio Recorder](https://play.google.com/store/apps/details?id=com.github.axet.audiorecorder) [F-Droid](https://f-droid.org/packages/com.github.axet.audiorecorder/)
+
+<br />
 
 ## Support
 
diff --git a/app/build.gradle b/app/build.gradle
index 78e15ecc90..8a83c1fb69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,8 +133,6 @@ android {
             buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/donate/\""
             buildConfigField "String", "CHANGELOG", "\"https://github.com/M66B/FairEmail/releases/\""
             buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\""
-            buildConfigField "String", "CAMERA_URI", "\"https://f-droid.org/en/packages/net.sourceforge.opencamera/\""
-            buildConfigField "String", "RECORDER_URI", "\"https://f-droid.org/packages/com.github.axet.audiorecorder/\""
             buildConfigField "String", "APPS_URI", "\"https://github.com/M66B?tab=repositories/\""
         }
         fdroid {
@@ -145,8 +143,6 @@ android {
             buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/donate/\""
             buildConfigField "String", "CHANGELOG", "\"https://github.com/M66B/FairEmail/releases/\""
             buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\""
-            buildConfigField "String", "CAMERA_URI", "\"https://f-droid.org/en/packages/net.sourceforge.opencamera/\""
-            buildConfigField "String", "RECORDER_URI", "\"https://f-droid.org/packages/com.github.axet.audiorecorder/\""
             buildConfigField "String", "APPS_URI", "\"https://github.com/M66B?tab=repositories/\""
         }
         play {
@@ -158,8 +154,6 @@ android {
             buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/#pro\""
             buildConfigField "String", "CHANGELOG", "\"\""
             buildConfigField "String", "GITHUB_LATEST_API", "\"\""
-            buildConfigField "String", "CAMERA_URI", "\"https://play.google.com/store/apps/details?id=net.sourceforge.opencamera\""
-            buildConfigField "String", "RECORDER_URI", "\"https://play.google.com/store/apps/details?id=com.github.axet.audiorecorder\""
             buildConfigField "String", "APPS_URI", "\"https://play.google.com/store/apps/dev?id=8420080860664580239\""
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 32d8005ac3..f153b630da 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1476,7 +1476,7 @@ public class FragmentCompose extends FragmentBase {
             snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Helper.view(getContext(), Uri.parse(BuildConfig.RECORDER_URI), false);
+                    Helper.viewFAQ(getContext(), 158);
                 }
             });
             snackbar.show();
@@ -1878,7 +1878,7 @@ public class FragmentCompose extends FragmentBase {
                 snackbar.setAction(R.string.title_fix, new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        Helper.view(getContext(), Uri.parse(BuildConfig.CAMERA_URI), false);
+                        Helper.viewFAQ(getContext(), 158);
                     }
                 });
                 snackbar.show();