diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8b739614b3..833d5fd17a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2241,6 +2241,15 @@ public class FragmentMessages extends FragmentBase {
 
             Log.i("Submit messages=" + messages.size());
             adapter.submitList(messages);
+
+            // This is to workaround not drawing when the search is expanded
+            new Handler().post(new Runnable() {
+                @Override
+                public void run() {
+                    rvMessage.requestLayout();
+                }
+            });
+
             rvMessage.setTag(messages.size());
 
             if (boundaryCallback == null || !boundaryCallback.isLoading())