diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs
index 1c51fdefe..54bfcc4f2 100644
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -695,7 +695,7 @@ pub unsafe extern "C" fn dc_get_msg_info(
     assert!(!context.is_null());
     let context = &*context;
 
-    dc_msg::dc_get_msg_info(context, msg_id)
+    message::dc_get_msg_info(context, msg_id)
 }
 
 #[no_mangle]
@@ -706,7 +706,7 @@ pub unsafe extern "C" fn dc_get_mime_headers(
     assert!(!context.is_null());
     let context = &*context;
 
-    dc_msg::dc_get_mime_headers(context, msg_id)
+    message::dc_get_mime_headers(context, msg_id)
 }
 
 #[no_mangle]
@@ -720,7 +720,7 @@ pub unsafe extern "C" fn dc_delete_msgs(
     assert!(msg_cnt > 0);
     let context = &*context;
 
-    dc_msg::dc_delete_msgs(context, msg_ids, msg_cnt)
+    message::dc_delete_msgs(context, msg_ids, msg_cnt)
 }
 
 #[no_mangle]
@@ -758,7 +758,7 @@ pub unsafe extern "C" fn dc_markseen_msgs(
     assert!(msg_cnt > 0);
     let context = &*context;
 
-    dc_msg::dc_markseen_msgs(context, msg_ids, msg_cnt as usize);
+    message::dc_markseen_msgs(context, msg_ids, msg_cnt as usize);
 }
 
 #[no_mangle]
@@ -774,7 +774,7 @@ pub unsafe extern "C" fn dc_star_msgs(
 
     let context = &*context;
 
-    dc_msg::dc_star_msgs(context, msg_ids, msg_cnt, star);
+    message::dc_star_msgs(context, msg_ids, msg_cnt, star);
 }
 
 #[no_mangle]
@@ -785,7 +785,7 @@ pub unsafe extern "C" fn dc_get_msg<'a>(
     assert!(!context.is_null());
     let context = &*context;
 
-    dc_msg::dc_get_msg(context, msg_id).into_raw()
+    message::dc_get_msg(context, msg_id).into_raw()
 }
 
 #[no_mangle]
@@ -1401,7 +1401,7 @@ pub unsafe extern "C" fn dc_chat_is_sending_locations(chat: *mut dc_chat_t) -> l
 // dc_msg_t
 
 #[no_mangle]
-pub type dc_msg_t<'a> = dc_msg::Message<'a>;
+pub type dc_msg_t<'a> = message::Message<'a>;
 
 #[no_mangle]
 pub unsafe extern "C" fn dc_msg_new<'a>(
@@ -1412,7 +1412,7 @@ pub unsafe extern "C" fn dc_msg_new<'a>(
     let context = &*context;
     let viewtype = from_prim(viewtype).expect(&format!("invalid viewtype = {}", viewtype));
 
-    Box::into_raw(Box::new(dc_msg::dc_msg_new(context, viewtype)))
+    Box::into_raw(Box::new(message::dc_msg_new(context, viewtype)))
 }
 
 #[no_mangle]
@@ -1427,7 +1427,7 @@ pub unsafe extern "C" fn dc_msg_get_id(msg: *mut dc_msg_t) -> u32 {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_id(msg)
+    message::dc_msg_get_id(msg)
 }
 
 #[no_mangle]
@@ -1435,7 +1435,7 @@ pub unsafe extern "C" fn dc_msg_get_from_id(msg: *mut dc_msg_t) -> u32 {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_from_id(msg)
+    message::dc_msg_get_from_id(msg)
 }
 
 #[no_mangle]
@@ -1443,7 +1443,7 @@ pub unsafe extern "C" fn dc_msg_get_chat_id(msg: *mut dc_msg_t) -> u32 {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_chat_id(msg)
+    message::dc_msg_get_chat_id(msg)
 }
 
 #[no_mangle]
@@ -1451,7 +1451,7 @@ pub unsafe extern "C" fn dc_msg_get_viewtype(msg: *mut dc_msg_t) -> libc::c_int
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_viewtype(msg)
+    message::dc_msg_get_viewtype(msg)
         .to_i64()
         .expect("impossible: Viewtype -> i64 conversion failed") as libc::c_int
 }
@@ -1461,7 +1461,7 @@ pub unsafe extern "C" fn dc_msg_get_state(msg: *mut dc_msg_t) -> libc::c_int {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_state(msg) as libc::c_int
+    message::dc_msg_get_state(msg) as libc::c_int
 }
 
 #[no_mangle]
@@ -1469,7 +1469,7 @@ pub unsafe extern "C" fn dc_msg_get_timestamp(msg: *mut dc_msg_t) -> i64 {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_timestamp(msg)
+    message::dc_msg_get_timestamp(msg)
 }
 
 #[no_mangle]
@@ -1477,7 +1477,7 @@ pub unsafe extern "C" fn dc_msg_get_received_timestamp(msg: *mut dc_msg_t) -> i6
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_received_timestamp(msg)
+    message::dc_msg_get_received_timestamp(msg)
 }
 
 #[no_mangle]
@@ -1485,7 +1485,7 @@ pub unsafe extern "C" fn dc_msg_get_sort_timestamp(msg: *mut dc_msg_t) -> i64 {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_sort_timestamp(msg)
+    message::dc_msg_get_sort_timestamp(msg)
 }
 
 #[no_mangle]
@@ -1493,7 +1493,7 @@ pub unsafe extern "C" fn dc_msg_get_text(msg: *mut dc_msg_t) -> *mut libc::c_cha
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_text(msg)
+    message::dc_msg_get_text(msg)
 }
 
 #[no_mangle]
@@ -1501,7 +1501,7 @@ pub unsafe extern "C" fn dc_msg_get_file(msg: *mut dc_msg_t) -> *mut libc::c_cha
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_file(msg)
+    message::dc_msg_get_file(msg)
 }
 
 #[no_mangle]
@@ -1509,7 +1509,7 @@ pub unsafe extern "C" fn dc_msg_get_filename(msg: *mut dc_msg_t) -> *mut libc::c
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_filename(msg)
+    message::dc_msg_get_filename(msg)
 }
 
 #[no_mangle]
@@ -1517,7 +1517,7 @@ pub unsafe extern "C" fn dc_msg_get_filemime(msg: *mut dc_msg_t) -> *mut libc::c
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_filemime(msg)
+    message::dc_msg_get_filemime(msg)
 }
 
 #[no_mangle]
@@ -1525,7 +1525,7 @@ pub unsafe extern "C" fn dc_msg_get_filebytes(msg: *mut dc_msg_t) -> u64 {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_filebytes(msg)
+    message::dc_msg_get_filebytes(msg)
 }
 
 #[no_mangle]
@@ -1533,7 +1533,7 @@ pub unsafe extern "C" fn dc_msg_get_width(msg: *mut dc_msg_t) -> libc::c_int {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_width(msg)
+    message::dc_msg_get_width(msg)
 }
 
 #[no_mangle]
@@ -1541,7 +1541,7 @@ pub unsafe extern "C" fn dc_msg_get_height(msg: *mut dc_msg_t) -> libc::c_int {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_height(msg)
+    message::dc_msg_get_height(msg)
 }
 
 #[no_mangle]
@@ -1549,7 +1549,7 @@ pub unsafe extern "C" fn dc_msg_get_duration(msg: *mut dc_msg_t) -> libc::c_int
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_duration(msg)
+    message::dc_msg_get_duration(msg)
 }
 
 #[no_mangle]
@@ -1557,7 +1557,7 @@ pub unsafe extern "C" fn dc_msg_get_showpadlock(msg: *mut dc_msg_t) -> libc::c_i
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_showpadlock(msg)
+    message::dc_msg_get_showpadlock(msg)
 }
 
 #[no_mangle]
@@ -1570,7 +1570,7 @@ pub unsafe extern "C" fn dc_msg_get_summary<'a>(
 
     let msg = &mut *msg;
 
-    let lot = dc_msg::dc_msg_get_summary(msg, chat);
+    let lot = message::dc_msg_get_summary(msg, chat);
     Box::into_raw(Box::new(lot))
 }
 
@@ -1582,7 +1582,7 @@ pub unsafe extern "C" fn dc_msg_get_summarytext(
     assert!(!msg.is_null());
 
     let msg = &mut *msg;
-    dc_msg::dc_msg_get_summarytext(msg, approx_characters.try_into().unwrap())
+    message::dc_msg_get_summarytext(msg, approx_characters.try_into().unwrap())
 }
 
 #[no_mangle]
@@ -1590,7 +1590,7 @@ pub unsafe extern "C" fn dc_msg_has_deviating_timestamp(msg: *mut dc_msg_t) -> l
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_has_deviating_timestamp(msg)
+    message::dc_msg_has_deviating_timestamp(msg)
 }
 
 #[no_mangle]
@@ -1598,7 +1598,7 @@ pub unsafe extern "C" fn dc_msg_has_location(msg: *mut dc_msg_t) -> libc::c_int
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_has_location(msg) as libc::c_int
+    message::dc_msg_has_location(msg) as libc::c_int
 }
 
 #[no_mangle]
@@ -1606,7 +1606,7 @@ pub unsafe extern "C" fn dc_msg_is_sent(msg: *mut dc_msg_t) -> libc::c_int {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_is_sent(msg)
+    message::dc_msg_is_sent(msg)
 }
 
 #[no_mangle]
@@ -1614,7 +1614,7 @@ pub unsafe extern "C" fn dc_msg_is_starred(msg: *mut dc_msg_t) -> libc::c_int {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_is_starred(msg).into()
+    message::dc_msg_is_starred(msg).into()
 }
 
 #[no_mangle]
@@ -1622,7 +1622,7 @@ pub unsafe extern "C" fn dc_msg_is_forwarded(msg: *mut dc_msg_t) -> libc::c_int
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_is_forwarded(msg)
+    message::dc_msg_is_forwarded(msg)
 }
 
 #[no_mangle]
@@ -1630,7 +1630,7 @@ pub unsafe extern "C" fn dc_msg_is_info(msg: *mut dc_msg_t) -> libc::c_int {
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_is_info(msg)
+    message::dc_msg_is_info(msg)
 }
 
 #[no_mangle]
@@ -1638,7 +1638,7 @@ pub unsafe extern "C" fn dc_msg_is_increation(msg: *mut dc_msg_t) -> libc::c_int
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_is_increation(msg)
+    message::dc_msg_is_increation(msg)
 }
 
 #[no_mangle]
@@ -1646,7 +1646,7 @@ pub unsafe extern "C" fn dc_msg_is_setupmessage(msg: *mut dc_msg_t) -> libc::c_i
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_is_setupmessage(msg) as libc::c_int
+    message::dc_msg_is_setupmessage(msg) as libc::c_int
 }
 
 #[no_mangle]
@@ -1654,7 +1654,7 @@ pub unsafe extern "C" fn dc_msg_get_setupcodebegin(msg: *mut dc_msg_t) -> *mut l
     assert!(!msg.is_null());
 
     let msg = &*msg;
-    dc_msg::dc_msg_get_setupcodebegin(msg)
+    message::dc_msg_get_setupcodebegin(msg)
 }
 
 #[no_mangle]
@@ -1663,7 +1663,7 @@ pub unsafe extern "C" fn dc_msg_set_text(msg: *mut dc_msg_t, text: *mut libc::c_
 
     let msg = &mut *msg;
     // TODO: {text} equal to NULL is treated as "", which is strange. Does anyone rely on it?
-    dc_msg::dc_msg_set_text(msg, text)
+    message::dc_msg_set_text(msg, text)
 }
 
 #[no_mangle]
@@ -1675,7 +1675,7 @@ pub unsafe extern "C" fn dc_msg_set_file(
     assert!(!msg.is_null());
 
     let msg = &mut *msg;
-    dc_msg::dc_msg_set_file(msg, file, filemime)
+    message::dc_msg_set_file(msg, file, filemime)
 }
 
 #[no_mangle]
@@ -1687,7 +1687,7 @@ pub unsafe extern "C" fn dc_msg_set_dimension(
     assert!(!msg.is_null());
 
     let msg = &mut *msg;
-    dc_msg::dc_msg_set_dimension(msg, width, height)
+    message::dc_msg_set_dimension(msg, width, height)
 }
 
 #[no_mangle]
@@ -1695,7 +1695,7 @@ pub unsafe extern "C" fn dc_msg_set_duration(msg: *mut dc_msg_t, duration: libc:
     assert!(!msg.is_null());
 
     let msg = &mut *msg;
-    dc_msg::dc_msg_set_duration(msg, duration)
+    message::dc_msg_set_duration(msg, duration)
 }
 
 #[no_mangle]
@@ -1707,7 +1707,7 @@ pub unsafe extern "C" fn dc_msg_set_location(
     assert!(!msg.is_null());
 
     let msg = &mut *msg;
-    dc_msg::dc_msg_set_location(msg, latitude, longitude)
+    message::dc_msg_set_location(msg, latitude, longitude)
 }
 
 #[no_mangle]
@@ -1720,7 +1720,7 @@ pub unsafe extern "C" fn dc_msg_latefiling_mediasize(
     assert!(!msg.is_null());
 
     let msg = &mut *msg;
-    dc_msg::dc_msg_latefiling_mediasize(msg, width, height, duration)
+    message::dc_msg_latefiling_mediasize(msg, width, height, duration)
 }
 
 // dc_contact_t
diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs
index 31656dede..8decc66a4 100644
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -10,12 +10,12 @@ use deltachat::context::*;
 use deltachat::dc_configure::*;
 use deltachat::dc_imex::*;
 use deltachat::dc_location::*;
-use deltachat::dc_msg::*;
 use deltachat::dc_receive_imf::*;
 use deltachat::dc_tools::*;
 use deltachat::error::Error;
 use deltachat::job::*;
 use deltachat::lot::LotState;
+use deltachat::message::*;
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::sql;
diff --git a/src/chat.rs b/src/chat.rs
index add8245d6..105a215e7 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -5,10 +5,10 @@ use crate::chatlist::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::Context;
-use crate::dc_msg::*;
 use crate::dc_tools::*;
 use crate::error::Error;
 use crate::job::*;
+use crate::message::*;
 use crate::param::*;
 use crate::sql::{self, Sql};
 use crate::stock::StockMessage;
diff --git a/src/chatlist.rs b/src/chatlist.rs
index 21aed4890..0190b7de4 100644
--- a/src/chatlist.rs
+++ b/src/chatlist.rs
@@ -2,9 +2,9 @@ use crate::chat::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::*;
-use crate::dc_msg::*;
 use crate::error::Result;
 use crate::lot::Lot;
+use crate::message::*;
 use crate::stock::StockMessage;
 
 /// An object representing a single chatlist in memory.
diff --git a/src/contact.rs b/src/contact.rs
index ff1a39901..6e3bcfd45 100644
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -9,10 +9,10 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::dc_e2ee::*;
 use crate::dc_loginparam::*;
-use crate::dc_msg::MessageState;
 use crate::dc_tools::*;
 use crate::error::Result;
 use crate::key::*;
+use crate::message::MessageState;
 use crate::peerstate::*;
 use crate::sql;
 use crate::stock::StockMessage;
diff --git a/src/context.rs b/src/context.rs
index c18e972b4..45f3c5de4 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -5,7 +5,6 @@ use crate::constants::*;
 use crate::contact::*;
 use crate::dc_loginparam::*;
 use crate::dc_move::*;
-use crate::dc_msg::*;
 use crate::dc_receive_imf::*;
 use crate::dc_tools::*;
 use crate::imap::*;
@@ -13,6 +12,7 @@ use crate::job::*;
 use crate::job_thread::JobThread;
 use crate::key::*;
 use crate::lot::Lot;
+use crate::message::*;
 use crate::param::Params;
 use crate::smtp::*;
 use crate::sql::Sql;
diff --git a/src/dc_imex.rs b/src/dc_imex.rs
index c76b333af..47c62a573 100644
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -12,11 +12,11 @@ use crate::constants::*;
 use crate::context::Context;
 use crate::dc_configure::*;
 use crate::dc_e2ee::*;
-use crate::dc_msg::*;
 use crate::dc_tools::*;
 use crate::error::*;
 use crate::job::*;
 use crate::key::*;
+use crate::message::*;
 use crate::param::*;
 use crate::pgp::*;
 use crate::sql::{self, Sql};
diff --git a/src/dc_location.rs b/src/dc_location.rs
index 7dc265ff6..fd1198feb 100644
--- a/src/dc_location.rs
+++ b/src/dc_location.rs
@@ -5,9 +5,9 @@ use crate::chat;
 use crate::constants::Event;
 use crate::constants::*;
 use crate::context::*;
-use crate::dc_msg::*;
 use crate::dc_tools::*;
 use crate::job::*;
+use crate::message::*;
 use crate::param::*;
 use crate::sql;
 use crate::stock::StockMessage;
diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs
index af9689156..b844040b2 100644
--- a/src/dc_mimefactory.rs
+++ b/src/dc_mimefactory.rs
@@ -17,10 +17,10 @@ use crate::contact::*;
 use crate::context::{dc_get_version_str, Context};
 use crate::dc_e2ee::*;
 use crate::dc_location::*;
-use crate::dc_msg::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::error::Error;
+use crate::message::*;
 use crate::param::*;
 use crate::stock::StockMessage;
 use crate::types::*;
diff --git a/src/dc_move.rs b/src/dc_move.rs
index 5eb5b5174..0116f1570 100644
--- a/src/dc_move.rs
+++ b/src/dc_move.rs
@@ -1,7 +1,7 @@
 use crate::constants::*;
 use crate::context::*;
-use crate::dc_msg::*;
 use crate::job::*;
+use crate::message::*;
 use crate::param::Params;
 
 pub unsafe fn dc_do_heuristics_moves(context: &Context, folder: &str, msg_id: u32) {
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index c81053001..1b834de02 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -17,12 +17,12 @@ use crate::context::Context;
 use crate::dc_location::*;
 use crate::dc_mimeparser::*;
 use crate::dc_move::*;
-use crate::dc_msg::*;
 use crate::dc_securejoin::*;
 use crate::dc_strencode::*;
 use crate::dc_tools::*;
 use crate::error::Result;
 use crate::job::*;
+use crate::message::*;
 use crate::param::*;
 use crate::peerstate::*;
 use crate::sql;
diff --git a/src/dc_securejoin.rs b/src/dc_securejoin.rs
index b4ff73cc1..62f22a89d 100644
--- a/src/dc_securejoin.rs
+++ b/src/dc_securejoin.rs
@@ -9,11 +9,11 @@ use crate::context::Context;
 use crate::dc_configure::*;
 use crate::dc_e2ee::*;
 use crate::dc_mimeparser::*;
-use crate::dc_msg::*;
 use crate::dc_token::*;
 use crate::dc_tools::*;
 use crate::key::*;
 use crate::lot::LotState;
+use crate::message::*;
 use crate::param::*;
 use crate::peerstate::*;
 use crate::qr::check_qr;
diff --git a/src/job.rs b/src/job.rs
index a147a944f..76634aed7 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -13,9 +13,9 @@ use crate::dc_imex::*;
 use crate::dc_location::*;
 use crate::dc_loginparam::*;
 use crate::dc_mimefactory::*;
-use crate::dc_msg::*;
 use crate::dc_tools::*;
 use crate::imap::*;
+use crate::message::*;
 use crate::param::*;
 use crate::sql;
 use crate::types::*;
diff --git a/src/lib.rs b/src/lib.rs
index 37ba888c6..cac00c702 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,6 +35,7 @@ mod job_thread;
 pub mod key;
 pub mod keyring;
 pub mod lot;
+pub mod message;
 pub mod oauth2;
 mod param;
 pub mod peerstate;
@@ -56,7 +57,6 @@ mod dc_loginparam;
 mod dc_mimefactory;
 pub mod dc_mimeparser;
 mod dc_move;
-pub mod dc_msg;
 pub mod dc_receive_imf;
 pub mod dc_securejoin;
 mod dc_simplify;
diff --git a/src/dc_msg.rs b/src/message.rs
similarity index 100%
rename from src/dc_msg.rs
rename to src/message.rs