diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 5b0b05649a..2a430d8dff 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -57,7 +57,10 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.Display;
 import android.view.InflateException;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.view.WindowManager;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -1613,9 +1616,15 @@ public class Log {
             final Throwable ex = (Throwable) getArguments().getSerializable("ex");
             boolean report = getArguments().getBoolean("report", true);
 
+            final Context context = getContext();
+            LayoutInflater inflater = LayoutInflater.from(context);
+            View dview = inflater.inflate(R.layout.dialog_unexpected, null);
+            TextView tvError = dview.findViewById(R.id.tvError);
+
+            tvError.setText(Log.formatThrowable(ex, false));
+
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext())
-                    .setTitle(R.string.title_unexpected_error)
-                    .setMessage(Log.formatThrowable(ex, false))
+                    .setView(dview)
                     .setPositiveButton(android.R.string.cancel, null);
 
             if (report)
diff --git a/app/src/main/res/layout/dialog_unexpected.xml b/app/src/main/res/layout/dialog_unexpected.xml
new file mode 100644
index 0000000000..986bbe2ce4
--- /dev/null
+++ b/app/src/main/res/layout/dialog_unexpected.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<eu.faircode.email.ScrollViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fadeScrollbars="false"
+    android:padding="24dp"
+    android:scrollbarStyle="outsideOverlay">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvCaption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_bug_report_24"
+            android:drawablePadding="6dp"
+            android:labelFor="@+id/etName"
+            android:text="@string/title_unexpected_error"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvError"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="Error"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textIsSelectable="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvCaption" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</eu.faircode.email.ScrollViewEx>
\ No newline at end of file