diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index ac1d08b557..742fb73226 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -746,6 +746,28 @@
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="btnHtml,ibQuotes,ibImages" />
 
+        <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"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/barrier_body" />
+
+        <TextView
+            android:id="@+id/tvNoInternetBody"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:text="@string/title_no_internet"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/pbBody" />
+
         <TextView
             android:id="@+id/tvBody"
             android:layout_width="0dp"
@@ -760,7 +782,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/barrier_body" />
+            app:layout_constraintTop_toBottomOf="@id/tvNoInternetBody" />
 
         <View
             android:id="@+id/vwBody"
@@ -770,28 +792,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
-        <eu.faircode.email.ContentLoadingProgressBar
-            android:id="@+id/pbBody"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/vwBody"
-            app:layout_constraintEnd_toEndOf="@id/tvBody"
-            app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toTopOf="@id/tvBody" />
-
-        <TextView
-            android:id="@+id/tvNoInternetBody"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_no_internet"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/vwBody"
-            app:layout_constraintEnd_toEndOf="@id/tvBody"
-            app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toTopOf="@id/tvBody" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvImage"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 88c31bbf1c..8d5ed428fc 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -736,6 +736,28 @@
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="btnHtml,ibQuotes,ibImages" />
 
+        <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"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/barrier_body" />
+
+        <TextView
+            android:id="@+id/tvNoInternetBody"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:text="@string/title_no_internet"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/pbBody" />
+
         <TextView
             android:id="@+id/tvBody"
             android:layout_width="0dp"
@@ -749,7 +771,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/barrier_body" />
+            app:layout_constraintTop_toBottomOf="@id/tvNoInternetBody" />
 
         <View
             android:id="@+id/vwBody"
@@ -760,28 +782,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
-        <eu.faircode.email.ContentLoadingProgressBar
-            android:id="@+id/pbBody"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/vwBody"
-            app:layout_constraintEnd_toEndOf="@id/tvBody"
-            app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toTopOf="@id/tvBody" />
-
-        <TextView
-            android:id="@+id/tvNoInternetBody"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_no_internet"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/vwBody"
-            app:layout_constraintEnd_toEndOf="@id/tvBody"
-            app:layout_constraintStart_toStartOf="@id/tvBody"
-            app:layout_constraintTop_toTopOf="@id/tvBody" />
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvImage"
             android:layout_width="0dp"