diff --git a/zed-rpc/src/peer.rs b/zed-rpc/src/peer.rs
index 49f62ec15b4c642af1d0b259b1037a90ede3b9b1..87d07c694ea953c4f5bf9b6e7efde46be77603e6 100644
--- a/zed-rpc/src/peer.rs
+++ b/zed-rpc/src/peer.rs
@@ -28,7 +28,6 @@ type MessageHandler = Box<
     dyn Send + Sync + Fn(&mut Option<proto::Envelope>, ConnectionId) -> Option<BoxFuture<bool>>,
 >;
 
-#[derive(Clone, Copy)]
 pub struct Receipt<T> {
     sender_id: ConnectionId,
     message_id: u32,
@@ -376,6 +375,18 @@ where
     }
 }
 
+impl<T> Clone for Receipt<T> {
+    fn clone(&self) -> Self {
+        Self {
+            sender_id: self.sender_id,
+            message_id: self.message_id,
+            payload_type: PhantomData,
+        }
+    }
+}
+
+impl<T> Copy for Receipt<T> {}
+
 impl fmt::Display for ConnectionId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
@@ -391,6 +402,7 @@ impl fmt::Display for PeerId {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use postage::oneshot;
     use smol::{
         io::AsyncWriteExt,
         net::unix::{UnixListener, UnixStream},
diff --git a/zed-rpc/src/proto.rs b/zed-rpc/src/proto.rs
index 1db8fe8d01de4c825d66d879d7cbd39543e3cf07..53001c202088d1360c16f6fe23c2512c26ded87d 100644
--- a/zed-rpc/src/proto.rs
+++ b/zed-rpc/src/proto.rs
@@ -8,7 +8,7 @@ use std::{
 
 include!(concat!(env!("OUT_DIR"), "/zed.messages.rs"));
 
-pub trait EnvelopedMessage: Sized + Send + 'static {
+pub trait EnvelopedMessage: Clone + Sized + Send + 'static {
     const NAME: &'static str;
     fn into_envelope(
         self,