diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 0706458c61..836fd5135f 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -267,6 +267,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 state.ifolder = (IMAPFolder) state.iservice.getStore().getFolder(browsable.name);
                 state.ifolder.open(Folder.READ_WRITE);
 
+                int count = state.ifolder.getMessageCount();
+                db.folder().setFolderTotal(browsable.id, count < 0 ? null : count);
+
                 Log.i("Boundary server query=" + query);
                 if (query == null) {
                     Calendar cal_browse = Calendar.getInstance();