diff --git a/src/main/java/com/owncloud/android/ui/activity/Preferences.java b/src/main/java/com/owncloud/android/ui/activity/Preferences.java
index 4cbec4bd2f..34c68914a1 100644
--- a/src/main/java/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/main/java/com/owncloud/android/ui/activity/Preferences.java
@@ -356,10 +356,10 @@ public class Preferences extends PreferenceActivity
         if (pFeedback != null) {
             if (feedbackEnabled) {
                 pFeedback.setOnPreferenceClickListener(preference -> {
-                    String feedbackMail = getString(R.string.mail_feedback);
                     String feedback = getText(R.string.prefs_feedback) + " - android v" + appVersion;
-                    Intent intent = new Intent(Intent.ACTION_SENDTO);
-                    intent.setDataAndType(Uri.parse(feedbackMail), "text/plain");
+                    Intent intent = new Intent(Intent.ACTION_SENDTO,
+                        Uri.fromParts("mailto", "", null));
+                    intent.putExtra(android.content.Intent.EXTRA_EMAIL,new String[] { getString(R.string.mail_feedback) });
                     intent.putExtra(Intent.EXTRA_SUBJECT, feedback);
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml
index 61f61e9d81..d172c7f79c 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -107,7 +107,7 @@
     <bool name="license_enabled">true</bool>
     <string name="license_url" translatable="false">https://www.gnu.org/licenses/gpl-2.0.html</string>
     <string name="url_imprint"></string>
-    <string name="mail_feedback">"mailto:android@nextcloud.com"</string>
+    <string name="mail_feedback">android@nextcloud.com</string>
     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
     <string name="url_server_install">https://nextcloud.com/install</string>