diff --git a/src/runtime2/inbox.rs b/src/runtime2/inbox.rs
index 34023b2d4f910d5eadec4fd066abd37ce49737c4..8b1a6fd9b7a04dca1fd591b7fff46e2127c7975a 100644
--- a/src/runtime2/inbox.rs
+++ b/src/runtime2/inbox.rs
@@ -293,14 +293,14 @@ impl PrivateInbox {
 
     /// Retrieves the next unread message. Should only be called by the
     /// inbox-reader.
-    pub(crate) fn next_message(&mut self) -> Option<&DataMessage> {
+    pub(crate) fn next_message(&mut self) -> Option<(&PortIdLocal, &DataMessage)> {
         if self.len_read == self.messages.len() {
             return None;
         }
 
-        let (_, to_return) = &self.messages[self.len_read];
+        let (target_port, message) = &self.messages[self.len_read];
         self.len_read += 1;
-        return Some(to_return);
+        return Some((target_port, message));
     }
 
     /// Simply empties the inbox