diff --git a/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index abdc6463c..7e6db87b1 100644
--- a/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/commons/app/src/main/java/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.contributions;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -17,6 +18,7 @@ import android.support.v4.app.Fragment;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.CommonsApplication;
@@ -106,7 +108,14 @@ public class ContributionsListFragment extends Fragment {
                 feedbackIntent.setType("message/rfc822");
                 feedbackIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { CommonsApplication.FEEDBACK_EMAIL });
                 feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(CommonsApplication.FEEDBACK_EMAIL_SUBJECT, CommonsApplication.APPLICATION_VERSION));
-                startActivity(feedbackIntent);
+
+                try {
+                    startActivity(feedbackIntent);
+                }
+                catch (ActivityNotFoundException e) {
+                    Toast.makeText(getActivity(), R.string.no_email_client, Toast.LENGTH_SHORT).show();
+                }
+
                 return true;
             case R.id.menu_refresh:
                 ((SourceRefresher)getActivity()).refreshSource();
diff --git a/commons/app/src/main/res/values/strings.xml b/commons/app/src/main/res/values/strings.xml
index 8b55dede3..5b53614a7 100644
--- a/commons/app/src/main/res/values/strings.xml
+++ b/commons/app/src/main/res/values/strings.xml
@@ -80,6 +80,7 @@
     <string name="about_privacy_policy">&lt;a href="https://wikimediafoundation.org/wiki/Privacy_policy">Privacy policy&lt;/a></string>
     <string name="title_activity_about">About</string>
     <string name="menu_feedback">Send Feedback (via Email)</string>
+    <string name="no_email_client">No email client installed</string>
     <string name="provider_categories">Recently used categories</string>
 
     <string name="waiting_first_sync">Waiting for first sync...</string>