diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index e5cb681aa..016f93d29 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -130,8 +130,7 @@ public class NotificationListener extends NotificationListenerService {
                 source.equals("com.android.dialer") ||
                 source.equals("com.android.mms") ||
                 source.equals("com.moez.QKSMS") ||
-                source.equals("com.cyanogenmod.eleven") ||
-                source.equals("com.fsck.k9")) {
+                source.equals("com.cyanogenmod.eleven")) {
             return;
         }
 
@@ -141,6 +140,12 @@ public class NotificationListener extends NotificationListenerService {
             }
         }
 
+        if (source.equals("com.fsck.k9")) {
+            if (!"never".equals(sharedPrefs.getString("notification_mode_k9mail", "when_screen_off"))) {
+                return;
+            }
+        }
+
         LOG.info("Processing notification from source " + source);
 
         Bundle extras = notification.extras;