diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
index 19f9979a47..2557a805d3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
@@ -253,10 +253,10 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
         btnUnblockAll.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                final View dview = LayoutInflater.from(v.getContext()).inflate(R.layout.dialog_unblock, null);
+
                 new AlertDialog.Builder(v.getContext())
-                        .setIcon(R.drawable.twotone_help_24)
-                        .setTitle(R.string.title_unblock_all)
-                        .setMessage(R.string.title_unblock_all_remark)
+                        .setView(dview)
                         .setNegativeButton(android.R.string.cancel, null)
                         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                             @Override
diff --git a/app/src/main/res/layout/dialog_unblock.xml b/app/src/main/res/layout/dialog_unblock.xml
new file mode 100644
index 0000000000..d226e8b11a
--- /dev/null
+++ b/app/src/main/res/layout/dialog_unblock.xml
@@ -0,0 +1,38 @@
+<?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:padding="24dp"
+    android:scrollbarStyle="outsideOverlay">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tvCaption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_clear_all_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
+            android:text="@string/title_unblock_all"
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:labelFor="@+id/etName"
+            android:text="@string/title_unblock_all_remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?attr/colorWarning"
+            android:textStyle="bold"
+            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
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index f91b3e9844..faa2b56cd9 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -118,7 +118,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_delete_24"
+                    android:drawableEnd="@drawable/twotone_clear_all_24"
                     android:drawablePadding="6dp"
                     android:text="@string/title_unblock_all"
                     app:layout_constraintStart_toStartOf="parent"