diff --git a/packages/relayer/src/core.rs b/packages/relayer/src/core.rs
index ec383c9..5663990 100644
--- a/packages/relayer/src/core.rs
+++ b/packages/relayer/src/core.rs
@@ -65,7 +65,7 @@ pub async fn handle_email(email: String) -> Result<EmailAuthEvent, EmailError> {
                 error: format!("Request {} not found", request_id),
                 original_subject,
                 original_message_id: parsed_email.get_message_id().ok(),
-                email_request_context: None,
+                email_request_context: *Box::new(None),
                 command: None,
             });
         }
@@ -144,7 +144,7 @@ async fn handle_email_request(
                 error: "Account code found and for recovery".to_string(),
                 original_subject,
                 original_message_id: params.parsed_email.get_message_id().ok(),
-                email_request_context: None,
+                email_request_context: *Box::new(None),
                 command: None,
             })
         }
@@ -155,7 +155,7 @@ async fn handle_email_request(
                 error: "No account code found and not for recovery".to_string(),
                 original_subject,
                 original_message_id: params.parsed_email.get_message_id().ok(),
-                email_request_context: None,
+                email_request_context: *Box::new(None),
                 command: None,
             })
         }
@@ -224,7 +224,7 @@ async fn accept(
             error: "Failed to handle acceptance".to_string(),
             original_subject,
             original_message_id: params.parsed_email.get_message_id().ok(),
-            email_request_context: Some(params),
+            email_request_context: Some(Box::new(params)),
             command: Some(email_auth_msg_clone.proof.masked_command),
         })
     }
@@ -280,7 +280,7 @@ async fn recover(params: EmailRequestContext) -> Result<EmailAuthEvent, EmailErr
             error: "Failed to handle recovery".to_string(),
             original_subject,
             original_message_id: params.parsed_email.get_message_id().ok(),
-            email_request_context: Some(params),
+            email_request_context: Some(Box::new(params)),
             command: Some(email_auth_msg_clone.proof.masked_command),
         })
     }
diff --git a/packages/relayer/src/modules/mail.rs b/packages/relayer/src/modules/mail.rs
index cb7f045..30b8eae 100644
--- a/packages/relayer/src/modules/mail.rs
+++ b/packages/relayer/src/modules/mail.rs
@@ -24,7 +24,7 @@ pub enum EmailAuthEvent {
         error: String,
         original_subject: String,
         original_message_id: Option<String>,
-        email_request_context: Option<EmailRequestContext>,
+        email_request_context: Option<Box<EmailRequestContext>>,
         command: Option<String>,
     },
     RecoveryRequest {
diff --git a/packages/relayer/src/modules/web_server/rest_api.rs b/packages/relayer/src/modules/web_server/rest_api.rs
index 58cf22b..3966192 100644
--- a/packages/relayer/src/modules/web_server/rest_api.rs
+++ b/packages/relayer/src/modules/web_server/rest_api.rs
@@ -480,7 +480,7 @@ pub async fn receive_email_api_fn(email: String) -> Result<(), ApiError> {
                     error: e.to_string(),
                     original_subject,
                     original_message_id: parsed_email.get_message_id().ok(),
-                    email_request_context: None,
+                    email_request_context: *Box::new(None),
                     command: None,
                 })
                 .await