X-Git-Url: https://git.r.bdr.sh/rbdr/olden-mail/blobdiff_plain/df07d7b043eaba1f961d22883763ae77b7f68600..5bc877d3fa9025180020d0b25104cc22333e6252:/src/middleware/find_mailboxes_compatibility.rs

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index 2b5df8e..42db396 100644
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -50,12 +50,16 @@ impl Middleware for FindMailboxesCompatibility {
 
                 // Transform IMAPv4 "* LIST" lines to IMAPv3 "* MAILBOX"
                 if line.starts_with("* LIST") {
-                    if let Some(last_slash_pos) = line.rfind('/') {
-                        let mailbox_name = line[(last_slash_pos + 2)..].trim();
-                        return Some(format!("* MAILBOX {mailbox_name}\r"));
+                    if let Some(last_slash_pos) = line.rfind("\"/\"") {
+                        let mailbox_name = line[(last_slash_pos + 3)..].replace('"', "");
+                        return Some(format!("* MAILBOX {}\r", mailbox_name.trim()));
                     }
                 }
 
+                if line.contains("OK") {
+                    return Some("{tag} OK MAILBOX Completed.".to_string());
+                }
+
                 Some(line.to_string())
             })
             .collect();