diff --git a/src/imap_client.rs b/src/imap/client.rs
similarity index 100%
rename from src/imap_client.rs
rename to src/imap/client.rs
diff --git a/src/imap/idle.rs b/src/imap/idle.rs
index 5f88261b0..5c87dee19 100644
--- a/src/imap/idle.rs
+++ b/src/imap/idle.rs
@@ -7,8 +7,8 @@ use std::sync::atomic::Ordering;
 use std::time::{Duration, SystemTime};
 
 use crate::context::Context;
-use crate::imap_client::*;
 
+use super::client::{IdleHandle, Session};
 use super::select_folder;
 
 type Result<T> = std::result::Result<T, Error>;
diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index b484cc52f..9b57cf67e 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -22,7 +22,6 @@ use crate::dc_receive_imf::{
 };
 use crate::events::Event;
 use crate::headerdef::{HeaderDef, HeaderDefMap};
-use crate::imap_client::*;
 use crate::job::{job_add, Action};
 use crate::login_param::{CertificateChecks, LoginParam};
 use crate::message::{self, update_server_uid};
@@ -30,9 +29,12 @@ use crate::oauth2::dc_get_oauth2_access_token;
 use crate::param::Params;
 use crate::stock::StockMessage;
 
+mod client;
 mod idle;
 pub mod select_folder;
 
+use client::{Client, Session};
+
 type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug, Fail)]
diff --git a/src/lib.rs b/src/lib.rs
index 09a13b44e..dff1c8fcb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -37,7 +37,6 @@ pub mod contact;
 pub mod context;
 mod e2ee;
 mod imap;
-mod imap_client;
 pub mod imex;
 #[macro_use]
 pub mod job;