diff --git a/apps/shinkai-app/src/pages/Home.tsx b/apps/shinkai-app/src/pages/Home.tsx
index 11da30fc2..e87eec134 100644
--- a/apps/shinkai-app/src/pages/Home.tsx
+++ b/apps/shinkai-app/src/pages/Home.tsx
@@ -49,7 +49,7 @@ const MessageButton = ({ inbox }: { inbox: SmartInbox }) => {
     console.log('data', data);
     await updateInboxName({
       sender: auth?.shinkai_identity ?? '',
-      senderSubidentity: `${auth?.profile}/device/${auth?.registration_name}`,
+      senderSubidentity: auth?.profile,
       receiver: auth.shinkai_identity,
       receiverSubidentity: '',
       my_device_encryption_sk: auth.my_device_encryption_sk,
diff --git a/libs/shinkai-message-ts/src/api/methods.ts b/libs/shinkai-message-ts/src/api/methods.ts
index 01a319a39..081aa30a8 100644
--- a/libs/shinkai-message-ts/src/api/methods.ts
+++ b/libs/shinkai-message-ts/src/api/methods.ts
@@ -245,11 +245,11 @@ export const updateInboxName = async (
   try {
     const messageString =
       ShinkaiMessageBuilderWrapper.update_shinkai_inbox_name(
-        setupDetailsState.my_device_encryption_sk,
-        setupDetailsState.my_device_identity_sk,
+        setupDetailsState.profile_encryption_sk,
+        setupDetailsState.profile_identity_sk,
         setupDetailsState.node_encryption_pk,
-        sender + '/' + sender_subidentity,
-        "",
+        sender,
+        sender_subidentity,
         receiver,
         "",
         inboxId,
diff --git a/libs/shinkai-message-ts/src/wasm/ShinkaiMessageBuilderWrapper.ts b/libs/shinkai-message-ts/src/wasm/ShinkaiMessageBuilderWrapper.ts
index 79a09cee0..3654aa696 100644
--- a/libs/shinkai-message-ts/src/wasm/ShinkaiMessageBuilderWrapper.ts
+++ b/libs/shinkai-message-ts/src/wasm/ShinkaiMessageBuilderWrapper.ts
@@ -564,7 +564,7 @@ export class ShinkaiMessageBuilderWrapper {
     );
     builder.external_metadata_with_intra(receiver, sender, sender_subidentity);
     // TODO: fix encryption
-    builder.body_encryption('None');
+    builder.body_encryption('DiffieHellmanChaChaPoly1305');
 
     const message = builder.build_to_string();