Actually terminate with a newline

[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 af03f7983bf2f05f36eb7edee3548f2bf901e90a..42938ff9b8850354ce220e09b0c6146470073f37 100644 (file)
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -51,15 +51,21 @@ 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 + 1)..].replace('"', "");
+                        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());
+                    }
+                }
+
                 Some(line.to_string())
             })
             .collect();
 
-        lines.join("\n").into_bytes()
+        format!("{}\n", lines.join("\n")).into_bytes()
     }
 }