1 files changed, 9 insertions(+), 2 deletions(-)

M src/movers/mbsync.rs

@@ 36,8 36,15 @@ impl Mbsync {
 
     fn get_rename_pair(&self, from: PathBuf) -> (PathBuf, PathBuf) {
         let new_name: PathBuf = Mbsync::strip_uid(from.file_name().unwrap());
-        let maildir_parent: PathBuf = from.parent().unwrap().to_path_buf();
-        (from, self.target_path.join(maildir_parent).join(new_name))
+        let mut f = from.clone();
+        if f.pop() {
+            let maildir_parent = f.file_name().unwrap();
+            println!("target: {}, maildir_parent: {}", self.target_path.to_str().unwrap(), maildir_parent.to_str().unwrap());
+            (from, self.target_path.join(maildir_parent).join(new_name))
+        } else {
+            println!("target: {}, ", self.target_path.to_str().unwrap());
+            (from, self.target_path.join(new_name))
+        }
     }
 }