Read the tag

[rbdr/olden-mail] / src / middleware / find_mailboxes_compatibility.rs

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index a9318f9b9e4e6d2d478a9c54b56194b309410815..edf5f0694ef5876e6b58f8a1c5aa47ee3b4682de 100644 (file)
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -50,11 +50,15 @@ impl Middleware for FindMailboxesCompatibility {
 
                 // Transform IMAPv4 "* LIST" lines to IMAPv3 "* MAILBOX"
                 if line.starts_with("* LIST") {
 
                 // 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 + 1)..]
-                            .trim()
-                            .replace('"', "");
-                        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) = command.split("OK").next() {
+                        return Some(format!("{} OK MAILBOX Completed.\r", tag.trim()).to_string());

                     }
                 }
 
                     }
                 }