diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
index 5ae440e4d2..43569aafba 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
@@ -32,7 +32,7 @@ public class FragmentDialogMarkdown extends DialogFragmentEx {
         dialog.setContentView(dview);
         dialog.getWindow().setLayout(
                 WindowManager.LayoutParams.MATCH_PARENT,
-                WindowManager.LayoutParams.MATCH_PARENT);
+                WindowManager.LayoutParams.WRAP_CONTENT);
 
         new SimpleTask<Spanned>() {
             @Override
diff --git a/app/src/main/res/layout/dialog_markdown.xml b/app/src/main/res/layout/dialog_markdown.xml
index 3c8113bf70..a0d9460cfc 100644
--- a/app/src/main/res/layout/dialog_markdown.xml
+++ b/app/src/main/res/layout/dialog_markdown.xml
@@ -17,7 +17,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="12dp">
+            android:padding="24dp">
 
             <TextView
                 android:id="@+id/tvMarkdown"