diff --git a/meli/src/lib.rs b/meli/src/lib.rs
index 4b06cd28..ecad2f69 100644
--- a/meli/src/lib.rs
+++ b/meli/src/lib.rs
@@ -90,7 +90,6 @@ pub use melib::uuid;
 
 pub extern crate bitflags;
 pub extern crate serde_json;
-#[macro_use]
 pub extern crate smallvec;
 pub extern crate termion;
 
diff --git a/meli/src/types/helpers.rs b/meli/src/types/helpers.rs
index 588379ba..531903b9 100644
--- a/meli/src/types/helpers.rs
+++ b/meli/src/types/helpers.rs
@@ -56,6 +56,7 @@ impl File {
             .read(true)
             .write(true)
             .create(true)
+            .truncate(false)
             .open(&self.path)
             .chain_err_summary(|| format!("Could not create/open path {}", self.path.display()))
     }
diff --git a/melib/src/imap/mod.rs b/melib/src/imap/mod.rs
index 76c6cb57..1c98a678 100644
--- a/melib/src/imap/mod.rs
+++ b/melib/src/imap/mod.rs
@@ -411,7 +411,7 @@ impl MailBackend for ImapType {
             let inbox = timeout(uid_store.timeout, uid_store.mailboxes.lock())
                 .await?
                 .get(&mailbox_hash)
-                .map(std::clone::Clone::clone)
+                .cloned()
                 .unwrap();
             let mut conn = timeout(uid_store.timeout, main_conn.lock()).await?;
             watch::examine_updates(inbox, &mut conn, &uid_store).await?;
diff --git a/melib/src/imap/watch.rs b/melib/src/imap/watch.rs
index 048360c7..0da6a4fa 100644
--- a/melib/src/imap/watch.rs
+++ b/melib/src/imap/watch.rs
@@ -69,7 +69,7 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
         .await
         .values()
         .find(|f| f.parent.is_none() && (f.special_usage() == SpecialUsageMailbox::Inbox))
-        .map(std::clone::Clone::clone)
+        .cloned()
     {
         Some(mailbox) => mailbox,
         None => {
diff --git a/melib/src/nntp/mod.rs b/melib/src/nntp/mod.rs
index bc64b739..2d4b3a17 100644
--- a/melib/src/nntp/mod.rs
+++ b/melib/src/nntp/mod.rs
@@ -258,7 +258,7 @@ impl MailBackend for NntpType {
                 .lock()
                 .await
                 .get(&mailbox_hash)
-                .map(std::clone::Clone::clone)
+                .cloned()
                 .ok_or_else(|| {
                     Error::new(format!(
                         "Mailbox with hash {} not found in NNTP connection, this could possibly \