diff --git a/app/src/main/java/eu/faircode/email/EntityLog.java b/app/src/main/java/eu/faircode/email/EntityLog.java
index 304fb95dd3..1228b21198 100644
--- a/app/src/main/java/eu/faircode/email/EntityLog.java
+++ b/app/src/main/java/eu/faircode/email/EntityLog.java
@@ -67,7 +67,7 @@ public class EntityLog {
 
     public enum Type {General, Statistics, Scheduling, Network, Account, Protocol, Classification, Notification, Rules, Cloud, Debug}
 
-    static void log(final Context context, String data) {
+    public static void log(final Context context, String data) {
         log(context, Type.General, data);
     }
 
diff --git a/app/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java b/app/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java
index d51419a2e4..77a7bd18a7 100644
--- a/app/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java
+++ b/app/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java
@@ -78,8 +78,12 @@ public final class ShortcutBadger {
     public static boolean applyCount(Context context, int badgeCount) {
         try {
             applyCountOrThrow(context, badgeCount);
+            eu.faircode.email.EntityLog.log(context, "Applied badge count=" + badgeCount +
+                    " badger=" + sShortcutBadger.getClass());
             return true;
         } catch (ShortcutBadgeException e) {
+            eu.faircode.email.EntityLog.log(context, "badger=" + sShortcutBadger.getClass() + "\n" +
+                    e + "\n" + Log.getStackTraceString(e));
             if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
                 Log.d(LOG_TAG, "Unable to execute badge", e);
             }
@@ -210,6 +214,10 @@ public final class ShortcutBadger {
         ResolveInfo resolveInfoDefault = context.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
         validateInfoList(resolveInfoDefault, resolveInfos);
 
+        for (ResolveInfo ri : resolveInfos)
+            eu.faircode.email.EntityLog.log(context, "Badger pkg=" + ri.activityInfo.packageName +
+                    (ri.activityInfo.packageName.equals(resolveInfoDefault.activityInfo.packageName) ? "*" : ""));
+
         for (ResolveInfo resolveInfo : resolveInfos) {
             String currentHomePackage = resolveInfo.activityInfo.packageName;
 
@@ -231,6 +239,9 @@ public final class ShortcutBadger {
             }
         }
 
+        eu.faircode.email.EntityLog.log(context, "Selected badger=" +
+                (sShortcutBadger == null ? null : sShortcutBadger.getClass()));
+
         if (sShortcutBadger == null) {
             if (Build.MANUFACTURER.equalsIgnoreCase("ZUK"))
                 sShortcutBadger = new ZukHomeBadger();
@@ -244,6 +255,8 @@ public final class ShortcutBadger {
                 sShortcutBadger = new DefaultBadger();
         }
 
+        eu.faircode.email.EntityLog.log(context, "Using badger=" + sShortcutBadger.getClass());
+
         return true;
     }