diff --git a/src/runtime2/inbox.rs b/src/runtime2/inbox.rs
index 6c7f03c300f50335fb7e8b048ba18604d8cfb2bd..e98a76f7fc9be937aa92ed6b03eb8907fdc9bc37 100644
--- a/src/runtime2/inbox.rs
+++ b/src/runtime2/inbox.rs
@@ -17,6 +17,7 @@ use std::sync::Mutex;
 
 use super::ConnectorId;
 use crate::protocol::eval::ValueGroup;
+use crate::runtime2::inbox2::MessageFancy;
 use super::connector::BranchId;
 use super::port::PortIdLocal;
 
@@ -215,7 +216,7 @@ pub struct Message {
 // TODO: @Optimize, lazy concurrency. Probably ringbuffer with read/write heads.
 //  Should behave as a MPSC queue.
 pub struct PublicInbox {
-    messages: Mutex<VecDeque<Message>>,
+    messages: Mutex<VecDeque<MessageFancy>>,
 }
 
 impl PublicInbox {
@@ -225,12 +226,12 @@ impl PublicInbox {
         }
     }
 
-    pub fn insert_message(&self, message: Message) {
+    pub fn insert_message(&self, message: MessageFancy) {
         let mut lock = self.messages.lock().unwrap();
         lock.push_back(message);
     }
 
-    pub fn take_message(&self) -> Option<Message> {
+    pub fn take_message(&self) -> Option<MessageFancy> {
         let mut lock = self.messages.lock().unwrap();
         return lock.pop_front();
     }