X-Git-Url: https://git.r.bdr.sh/rbdr/olden-mail/blobdiff_plain/df07d7b043eaba1f961d22883763ae77b7f68600..83b70b6cadc619c765b36406661b0b629ab3b904:/src/middleware/find_mailboxes_compatibility.rs?ds=inline

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index 2b5df8e..42938ff 100644
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -50,9 +50,15 @@ 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") {
+                    if let Some(tag) = line.split("OK").next() {
+                        return Some(format!("{} OK MAILBOX Completed.\r", tag.trim()).to_string());
                     }
                 }
 
@@ -60,6 +66,6 @@ impl Middleware for FindMailboxesCompatibility {
             })
             .collect();
 
-        lines.join("\n").into_bytes()
+        format!("{}\n", lines.join("\n")).into_bytes()
     }
 }