diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index a77bcb70c6..6970f8ccc3 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -304,9 +304,6 @@ public class Log {
             try {
                 ThrowableWrapper ex = new ThrowableWrapper();
                 ex.setMessage(msg);
-                List<StackTraceElement> ss = new ArrayList<>(Arrays.asList(ex.getStackTrace()));
-                ss.remove(0);
-                ex.setStackTrace(ss.toArray(new StackTraceElement[0]));
                 Bugsnag.notify(ex, new OnErrorCallback() {
                     @Override
                     public boolean onError(@NonNull Event event) {
diff --git a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java
index a011226330..3b13ac4c6f 100644
--- a/app/src/main/java/eu/faircode/email/ThrowableWrapper.java
+++ b/app/src/main/java/eu/faircode/email/ThrowableWrapper.java
@@ -70,13 +70,13 @@ public class ThrowableWrapper extends Throwable {
     @Nullable
     @Override
     public String getMessage() {
-        return ex.getMessage();
+        return getSafeMessage();
     }
 
     @Nullable
     @Override
     public String getLocalizedMessage() {
-        return ex.getLocalizedMessage();
+        return getSafeMessage();
     }
 
     @NonNull
@@ -94,6 +94,6 @@ public class ThrowableWrapper extends Throwable {
     @NonNull
     @Override
     public String toString() {
-        return ex.toString();
+        return toSafeString();
     }
 }