diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index c59ea75c8d..33cab33b65 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -33,6 +33,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.Ringtone;
@@ -989,7 +990,11 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
                 channel.setSound(uri, Notification.AUDIO_ATTRIBUTES_DEFAULT);
         }
 
-        channel.enableLights(jchannel.getBoolean("light"));
+        boolean light = jchannel.getBoolean("light");
+        channel.enableLights(light);
+        if (light)
+            channel.setLightColor(Color.BLUE);
+
         channel.enableVibration(jchannel.getBoolean("vibrate"));
 
         return channel;
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3e3b4b4944..5a4b4365b9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1621,6 +1621,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     channel.setDescription(from.getPersonal());
                     channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
                     channel.enableLights(true);
+                    channel.setLightColor(Color.BLUE);
                     nm.createNotificationChannel(channel);
                     onActionEditChannel();
                 }
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 59b87a1d7d..6c7122d610 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -28,6 +28,7 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.DeadSystemException;
 import android.os.Handler;
@@ -308,6 +309,7 @@ public class ApplicationEx extends Application {
                     NotificationManager.IMPORTANCE_HIGH);
             notification.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             notification.enableLights(true);
+            notification.setLightColor(Color.BLUE);
             nm.createNotificationChannel(notification);
 
             if (!Helper.isPlayStoreInstall(this)) {
diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 0168c9e813..ce18a8d427 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -24,6 +24,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
@@ -122,6 +123,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
         channel.setGroup(group.getId());
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
         channel.enableLights(true);
+        channel.setLightColor(Color.BLUE);
         nm.createNotificationChannel(channel);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderEx.java b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
index d44394ded0..c46c7c837a 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
@@ -24,6 +24,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Build;
 
 import androidx.annotation.RequiresApi;
@@ -91,6 +92,7 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
         channel.setGroup(group.getId());
         channel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
         channel.enableLights(true);
+        channel.setLightColor(Color.BLUE);
         nm.createNotificationChannel(channel);
     }