diff --git a/src/job.rs b/src/job.rs
index defe54b89..a295449be 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -261,7 +261,15 @@ impl Job {
             return Status::Finished(Err(format_err!("MDNs are disabled")));
         }
 
-        let msg_id = MsgId::new(self.foreign_id);
+        let msg_id = if let Some(msg_id) = self.param.get_msg_id() {
+            msg_id
+        } else {
+            return Status::Finished(Err(format_err!(
+                "SendMdn job has invalid parameters: {}",
+                self.param
+            )));
+        };
+
         let msg = job_try!(Message::load_from_db(context, msg_id));
         let mimefactory = job_try!(MimeFactory::from_mdn(context, &msg));
         let rendered_msg = job_try!(mimefactory.render());
@@ -422,7 +430,7 @@ impl Job {
                 if msg.param.get_bool(Param::WantsMdn).unwrap_or_default()
                     && context.get_config_bool(Config::MdnsEnabled)
                 {
-                    if let Err(err) = send_mdn(context, msg.id) {
+                    if let Err(err) = send_mdn(context, &msg) {
                         warn!(context, "could not send out mdn for {}: {}", msg.id, err);
                         return Status::Finished(Err(err));
                     }
@@ -1003,14 +1011,11 @@ fn suspend_smtp_thread(context: &Context, suspend: bool) {
     }
 }
 
-fn send_mdn(context: &Context, msg_id: MsgId) -> Result<()> {
-    job_add(
-        context,
-        Action::SendMdn,
-        msg_id.to_u32() as i32,
-        Params::new(),
-        0,
-    );
+fn send_mdn(context: &Context, msg: &Message) -> Result<()> {
+    let mut param = Params::new();
+    param.set(Param::MessageId, msg.id.to_u32().to_string());
+
+    job_add(context, Action::SendMdn, msg.from_id as i32, param, 0);
 
     Ok(())
 }
diff --git a/src/param.rs b/src/param.rs
index 4608b32b4..618d97b52 100644
--- a/src/param.rs
+++ b/src/param.rs
@@ -8,6 +8,7 @@ use num_traits::FromPrimitive;
 use crate::blob::{BlobError, BlobObject};
 use crate::context::Context;
 use crate::error;
+use crate::message::MsgId;
 use crate::mimeparser::SystemMessage;
 
 /// Available param keys.
@@ -116,6 +117,9 @@ pub enum Param {
 
     /// For QR
     GroupName = b'g',
+
+    /// For MDN-sending job
+    MessageId = b'I',
 }
 
 /// Possible values for `Param::ForcePlaintext`.
@@ -312,6 +316,12 @@ impl Params {
         Ok(Some(path))
     }
 
+    pub fn get_msg_id(&self) -> Option<MsgId> {
+        self.get(Param::MessageId)
+            .and_then(|x| x.parse::<u32>().ok())
+            .map(MsgId::new)
+    }
+
     /// Set the given paramter to the passed in `i32`.
     pub fn set_int(&mut self, key: Param, value: i32) -> &mut Self {
         self.set(key, format!("{}", value));