diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 12c48baba8..9f6a6b62c9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -536,6 +536,7 @@ public class FragmentCompose extends FragmentBase {
 
         etExtra.setHint("");
         tvDomain.setText(null);
+        etBody.setText(null);
 
         grpHeader.setVisibility(View.GONE);
         grpExtra.setVisibility(View.GONE);
@@ -3275,6 +3276,12 @@ public class FragmentCompose extends FragmentBase {
         args.putBoolean("show_images", show_images);
 
         new SimpleTask<Spanned[]>() {
+            @Override
+            protected void onPreExecute(Bundle args) {
+                // Needed to get width for images
+                grpBody.setVisibility(View.VISIBLE);
+            }
+
             @Override
             protected void onPostExecute(Bundle args) {
                 state = State.LOADED;