diff --git a/extensions/warp-ipfs/src/store/payload.rs b/extensions/warp-ipfs/src/store/payload.rs
index 0e981ebbc..021d7b032 100644
--- a/extensions/warp-ipfs/src/store/payload.rs
+++ b/extensions/warp-ipfs/src/store/payload.rs
@@ -25,6 +25,7 @@ pub struct PayloadMessage<M> {
     date: DateTime<Utc>,
 
     /// bytes of the message serialized as cbor
+    #[serde(flatten)]
     message: PayloadSelectMessage<M>,
 
     /// recipients of the payload message, if any.
@@ -44,7 +45,7 @@ pub struct PayloadMessage<M> {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
-#[serde(rename_all = "lowercase")]
+#[serde(untagged)]
 enum PayloadSelectMessage<M> {
     Clear { message: M },
     Encrypted { bytes: Bytes },