diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 596238bf88..1e867b4c8f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1469,8 +1469,7 @@ public class FragmentMessages extends FragmentEx {
                 grpReady.setVisibility(View.VISIBLE);
 
                 if (messages.size() == 0) {
-                    if (searchCallback == null)
-                        tvNoEmail.setVisibility(View.VISIBLE);
+                    tvNoEmail.setVisibility(searching ? View.GONE : View.VISIBLE);
                     rvMessage.setVisibility(View.GONE);
                 } else {
                     tvNoEmail.setVisibility(View.GONE);