diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2fcc3288ac..6ea9cc54be 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -263,7 +263,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageButton ibImages;
         private ImageButton ibFull;
         private TextView tvBody;
-        private ImageView ivBodyWait;
+        private ContentLoadingProgressBar pbBody;
         private TextView tvNoInternetBody;
 
         private TextView tvCalendarSummary;
@@ -398,7 +398,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibImages = vsBody.findViewById(R.id.ibImages);
             ibFull = vsBody.findViewById(R.id.ibFull);
             tvBody = vsBody.findViewById(R.id.tvBody);
-            ivBodyWait = vsBody.findViewById(R.id.ivBodyWait);
+            pbBody = vsBody.findViewById(R.id.pbBody);
             tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody);
 
             rvImage = vsBody.findViewById(R.id.rvImage);
@@ -820,7 +820,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibImages.setVisibility(View.GONE);
             ibFull.setVisibility(View.GONE);
             tvBody.setVisibility(View.GONE);
-            ivBodyWait.setVisibility(View.GONE);
+            pbBody.setVisibility(View.GONE);
             tvNoInternetBody.setVisibility(View.GONE);
         }
 
@@ -1072,7 +1072,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }.execute(context, owner, sargs, "message:actions");
 
             // Message text
-            ivBodyWait.setVisibility(suitable || message.content ? View.VISIBLE : View.GONE);
+            pbBody.setVisibility(suitable || message.content ? View.VISIBLE : View.GONE);
             tvNoInternetBody.setVisibility(suitable || message.content ? View.GONE : View.VISIBLE);
 
             Spanned body = properties.getBody(message.id);
@@ -2056,7 +2056,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvBody.setTextIsSelectable(true);
                 tvBody.setMovementMethod(new TouchHandler(message));
 
-                ivBodyWait.setVisibility(View.GONE);
+                pbBody.setVisibility(View.GONE);
             }
 
             @Override
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index b6f8d38972..e684485942 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -37,12 +37,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inAttachments" />
 
-    <ImageView
-        android:id="@+id/ivBodyWait"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <eu.faircode.email.ContentLoadingProgressBar
+        android:id="@+id/pbBody"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:indeterminate="true"
         android:padding="12dp"
-        android:src="@drawable/baseline_hourglass_empty_24"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inNavigation" />