diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1c021f3802..19726be0d7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1626,6 +1626,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvHeaders.setText(HtmlHelper.highlightHeaders(context, message.headers));
             else
                 tvHeaders.setText(null);
+
+            new Handler().post(new Runnable() {
+                @Override
+                public void run() {
+                    View inHeaders = itemView.findViewById(R.id.inHeaders);
+
+                    Rect rect = new Rect();
+                    inHeaders.getDrawingRect(rect);
+                    ((ViewGroup) itemView).offsetDescendantRectToMyCoords(inHeaders, rect);
+
+                    properties.scrollTo(getAdapterPosition(), rect.top);
+                }
+            });
         }
 
         private void bindBody(TupleMessageEx message, final boolean scroll) {