diff --git a/src/modules/email/services/email.service.ts b/src/modules/email/services/email.service.ts
index fc53682..48125e7 100644
--- a/src/modules/email/services/email.service.ts
+++ b/src/modules/email/services/email.service.ts
@@ -67,16 +67,12 @@ export class EmailService {
 
       const response = await firstValueFrom(this.mailServerService.submission.submitMessage(userEmailId, sendEmailDto));
 
-      this.logger.log(`Email sent successfully: ${response.id} (Queue: ${response.queueId})`);
+      this.logger.log(`Email sent successfully: ${response.message.id} (Queue: ${response.message.queueId})`);
 
       return {
         message: EmailMessage.EMAIL_SENDING_SUCCESS,
-        messageId: response.id,
-        queueId: response.queueId,
-        from: response.from,
-        to: response.to,
-        subject: response.subject,
-        created: response.created,
+        messageId: response.message.id,
+        queueId: response.message.queueId,
       };
     } catch (error) {
       this.logger.error(`Failed to send email for user ${userEmailId}: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -406,15 +402,12 @@ export class EmailService {
 
       const response = await firstValueFrom(this.mailServerService.submission.submitMessage(userEmailId, draftData));
 
-      this.logger.log(`Draft updated successfully: ${response.id}`);
+      this.logger.log(`Draft updated successfully: ${response.message.mailbox}`);
 
       return {
         message: EmailMessage.DRAFT_UPDATED_SUCCESSFULLY,
-        messageId: response.id,
-        from: response.from,
-        to: response.to,
-        subject: response.subject || "Draft",
-        updated: response.created,
+        messageId: response.message.id,
+        subject: "Draft",
         isDraft: true,
       };
     } catch (error) {
diff --git a/src/modules/mail-server/interfaces/submission-response.interface.ts b/src/modules/mail-server/interfaces/submission-response.interface.ts
index 9078fe0..6f0e2b5 100644
--- a/src/modules/mail-server/interfaces/submission-response.interface.ts
+++ b/src/modules/mail-server/interfaces/submission-response.interface.ts
@@ -1,12 +1,10 @@
 export interface SubmissionResponse {
   success: true;
-  id: string;
-  queueId: string;
-  from: string;
-  to: string[];
-  subject: string;
-  messageId: string;
-  created: string;
+  message: {
+    id: string;
+    queueId: string;
+    mailbox: string;
+  };
 }
 
 export interface DeliveryStatus {
diff --git a/src/modules/mail-server/services/mail-server.service.ts b/src/modules/mail-server/services/mail-server.service.ts
index c55de27..37c4275 100644
--- a/src/modules/mail-server/services/mail-server.service.ts
+++ b/src/modules/mail-server/services/mail-server.service.ts
@@ -236,8 +236,8 @@ export class MailServerService {
 
     return this.submissionService.submitMessage(userId, messageData).pipe(
       map((result) => {
-        this.logger.log(`Message submitted with ID: ${result.messageId}`);
-        return { id: result.messageId, queueId: result.queueId };
+        this.logger.log(`Message submitted with ID: ${result.message.id}`);
+        return { id: result.message.id, queueId: result.message.queueId };
       }),
       catchError((error) => {
         this.logger.error(`Failed to send message: ${error.message}`);