fixup rebase

Author: Septias

src/mimefactory.rs

@@ -9,7 +9,6 @@ use chrono::TimeZone;
 use data_encoding::BASE32_NOPAD;
 use deltachat_contact_tools::sanitize_bidi_characters;
 use iroh_gossip::proto::TopicId;
-use mail_builder::headers::address::{Address, EmailAddress};
 use mail_builder::headers::HeaderType;
 use mail_builder::headers::address::{Address, EmailAddress};
 use mail_builder::mime::MimePart;
@@ -25,14 +24,14 @@ use crate::contact::{Contact, ContactId, Origin};
 use crate::context::Context;
 use crate::e2ee::EncryptHelper;
 use crate::ephemeral::Timer as EphemeralTimer;
-use crate::key::{DcKey, self_fingerprint, SignedPublicKey};
+use crate::headerdef::HeaderDef;
+use crate::key::{DcKey, SignedPublicKey, self_fingerprint};
 use crate::location;
 use crate::log::{info, warn};
 use crate::message::{Message, MsgId, Viewtype};
 use crate::mimeparser::{SystemMessage, is_hidden};
 use crate::param::Param;
 use crate::peer_channels::{create_iroh_header, get_iroh_topic_for_msg};
-use crate::peerstate::Peerstate;
 use crate::simplify::escape_message_footer_marks;
 use crate::stock_str;
 use crate::tools::{

src/peer_channels.rs

@@ -567,8 +567,8 @@ mod tests {
     use super::*;
     use crate::{
         EventType,
+        chat::{self, ChatId, ProtectionStatus, add_contact_to_chat, resend_msgs, send_msg},
         message::{Message, Viewtype},
-        chat::{self, add_contact_to_chat, resend_msgs, send_msg, ChatId, ProtectionStatus},
         test_utils::{TestContext, TestContextManager},
     };