diff --git a/app/src/main/java/eu/faircode/email/ActivityBilling.java b/app/src/main/java/eu/faircode/email/ActivityBilling.java
index 6240393182..6b5355f2be 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBilling.java
@@ -236,7 +236,6 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
                 view.setData(Uri.parse(BuildConfig.PRO_FEATURES_URI + "?challenge=" + getChallenge(this)));
                 Helper.view(this, view);
             } catch (NoSuchAlgorithmException ex) {
-                Log.e(ex);
                 Helper.unexpectedError(getSupportFragmentManager(), ex);
             }
     }
diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 5860704fc1..c7c82ad71f 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -378,7 +378,6 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
             try {
                 askPassword(true);
             } catch (Throwable ex) {
-                Log.e(ex);
                 Helper.unexpectedError(getSupportFragmentManager(), ex);
             }
         } else
@@ -389,7 +388,6 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
         try {
             askPassword(false);
         } catch (Throwable ex) {
-            Log.e(ex);
             Helper.unexpectedError(getSupportFragmentManager(), ex);
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8a99a35b02..b671774b98 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2737,7 +2737,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     else
                         ToastEx.makeText(context, R.string.title_pro_invalid, Toast.LENGTH_LONG).show();
                 } catch (NoSuchAlgorithmException ex) {
-                    Log.e(ex);
                     Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
                 }
             } else {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8dd75586e1..45fba0c20b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4107,7 +4107,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                 REQUEST_DECRYPT,
                                 null, 0, 0, 0, null);
                     } catch (IntentSender.SendIntentException ex) {
-                        Log.e(ex);
                         Helper.unexpectedError(getFragmentManager(), ex);
                     }
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 7637c326c1..e37e50e92c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -529,10 +529,8 @@ public class FragmentSetup extends FragmentBase {
                                         Log.w(ex);
                                         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
                                             Snackbar.make(view, Helper.formatThrowable(ex), Snackbar.LENGTH_LONG).show();
-                                    } else {
-                                        Log.e(ex);
+                                    } else
                                         Helper.unexpectedError(getFragmentManager(), ex);
-                                    }
                                 }
                             }
                         },
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index c5aa07e3d6..5915b097c9 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -465,7 +465,9 @@ public class Helper {
         return sb.toString();
     }
 
-    static void unexpectedError(FragmentManager manager, final Throwable ex) {
+    static void unexpectedError(FragmentManager manager, Throwable ex) {
+        Log.e(ex);
+
         Bundle args = new Bundle();
         args.putSerializable("ex", ex);