diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9870b678f1..7cd72f4e2e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -694,7 +694,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     properties.setValue("quotes", message.id, false);
                     properties.setValue("images", message.id, false);
                 }
+
                 notifyItemChanged(pos);
+
+                if (expanded)
+                    properties.scrollTo(pos, Math.round(tvBody.getY()));
             }
         }
 
@@ -1762,6 +1766,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         Spanned getBody(long id);
 
+        void scrollTo(int pos, int dy);
+
         void move(long id, String target, boolean type);
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 80969379ca..f33ed29697 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -334,6 +334,17 @@ public class FragmentMessages extends FragmentEx {
                         return bodies.get(id);
                     }
 
+                    @Override
+                    public void scrollTo(final int pos, final int dy) {
+                        new Handler().post(new Runnable() {
+                            @Override
+                            public void run() {
+                                rvMessage.scrollToPosition(pos);
+                                rvMessage.scrollBy(0, dy);
+                            }
+                        });
+                    }
+
                     @Override
                     public void move(long id, String name, boolean type) {
                         Bundle args = new Bundle();