diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index cec9a3ef81413dfc068b202cce994861bc101121..003f5471587111d9e32e02027331d13a422f5cea 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -180,6 +180,7 @@ public class NotificationService {
 
 		final String ringtone = preferences.getString("notification_ringtone", null);
 		final boolean vibrate = preferences.getBoolean("vibrate_on_notification", true);
+		final boolean led = preferences.getBoolean("led", true);
 
 		if (notifications.size() == 0) {
 			notificationManager.cancel(NOTIFICATION_ID);
@@ -210,7 +211,9 @@ public class NotificationService {
 			mBuilder.setDefaults(0);
 			mBuilder.setSmallIcon(R.drawable.ic_notification);
 			mBuilder.setDeleteIntent(createDeleteIntent());
-			mBuilder.setLights(0xff00FF00, 2000, 3000);
+			if (led) {
+				mBuilder.setLights(0xff00FF00, 2000, 3000);
+			}
 			final Notification notification = mBuilder.build();
 			notificationManager.notify(NOTIFICATION_ID, notification);
 		}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e991d0518a6e51b93a0ebbdec819acb8282bc9aa..e9e9973051252f023a1a59eed63597a91cffb3bd 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -108,9 +108,11 @@
 	<string name="pref_notifications">Notifications</string>
 	<string name="pref_notifications_summary">Notify when a new message arrives</string>
 	<string name="pref_vibrate">Vibrate</string>
-	<string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
-	<string name="pref_sound">Sound</string>
-	<string name="pref_sound_summary">Play ringtone with notification</string>
+	<string name="pref_vibrate_summary">Vibrate when a new message arrives</string>
+	<string name="pref_led">LED Notification</string>
+	<string name="pref_led_summary">Blink notification light when a new message arrives</string>
+	<string name="pref_sound">Ringtone</string>
+	<string name="pref_sound_summary">Play sound when a new message arrives</string>
 	<string name="pref_notification_grace_period">Notification grace period</string>
 	<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
 	<string name="pref_advanced_options">Advanced</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index f505baf7c1be3142d6a07fd1355095e8024e4409..e4b29856b3f8b80c4a1a7c773af1259cd7dd3305 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -79,7 +79,12 @@
             android:key="vibrate_on_notification"
             android:summary="@string/pref_vibrate_summary"
             android:title="@string/pref_vibrate"/>
-
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:dependency="show_notification"
+            android:key="led"
+            android:title="@string/pref_led"
+            android:summary="@string/pref_led_summary"/>
         <RingtonePreference
             android:defaultValue="content://settings/system/notification_sound"
             android:dependency="show_notification"