diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index 24e6ac39..3c6365b1 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -253,14 +253,15 @@ public class ImapConnection extends AbstractConnection {
                                                 // load folder in a separate thread
                                                 FolderLoadThread folderLoadThread = new FolderLoadThread(currentThread().getName(), currentFolder);
                                                 folderLoadThread.start();
-                                                os.write('*');
+                                                os.write("* LOADING ".getBytes());
                                                 while (!folderLoadThread.isComplete) {
                                                     folderLoadThread.join(10000);
-                                                    LOGGER.debug("Still loading " + currentFolder.folderPath);
+                                                    LOGGER.debug("Still loading " + currentFolder.folderPath+" ("+currentFolder.count()+" messages)");
                                                     os.write(' ');
                                                     os.flush();
                                                 }
-                                                sendClient(" " + currentFolder.count() + " EXISTS");
+                                                sendClient("COMPLETE");
+                                                sendClient("* " + currentFolder.count() + " EXISTS");
                                                 if (folderLoadThread.exception != null) {
                                                     throw folderLoadThread.exception;
                                                 }