diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 11f0d8ee1d..d3b0dd5956 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4090,11 +4090,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             int line = tvBody.getLayout().getLineForOffset(pos);
                             int y = tvBody.getLayout().getLineTop(line);
 
+                            int dy = Helper.dp2pixels(context, 48);
+
                             Rect rect = new Rect();
                             tvBody.getDrawingRect(rect);
                             ((ViewGroup) itemView).offsetDescendantRectToMyCoords(tvBody, rect);
 
-                            properties.scrollTo(apos, rect.top + y);
+                            properties.scrollTo(apos, rect.top + y - dy);
                         } catch (Throwable ex) {
                             Log.e(ex);
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 83080eedcb..3e83414927 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1546,7 +1546,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 @Override
                 public void run() {
                     LinearLayoutManager llm = (LinearLayoutManager) rvMessage.getLayoutManager();
-                    llm.scrollToPositionWithOffset(pos, -y);
+                    View child = llm.getChildAt(pos);
+                    int dy = (child == null ? 0 : llm.getTopDecorationHeight(child));
+                    llm.scrollToPositionWithOffset(pos, -y - dy);
                 }
             });
         }