diff --git a/internal_packages/onboarding/lib/account-settings-page.cjsx b/internal_packages/onboarding/lib/account-settings-page.cjsx
index b9c2c0c15..86aee0868 100644
--- a/internal_packages/onboarding/lib/account-settings-page.cjsx
+++ b/internal_packages/onboarding/lib/account-settings-page.cjsx
@@ -227,6 +227,7 @@ class AccountSettingsPage extends React.Component
       EdgehillAPI.request
         path: "/connect/nylas"
         method: "POST"
+        timeout: 30000
         body: json
         success: (json) =>
           OnboardingActions.accountJSONReceived(json)
diff --git a/src/flux/tasks/send-draft.coffee b/src/flux/tasks/send-draft.coffee
index d96b0e2ee..549d27ed9 100644
--- a/src/flux/tasks/send-draft.coffee
+++ b/src/flux/tasks/send-draft.coffee
@@ -60,6 +60,7 @@ class SendDraftTask extends Task
       accountId: @draft.accountId
       method: 'POST'
       body: body
+      timeout: 1000 * 60 * 5 # We cannot hang up a send - won't know if it sent
       returnsModel: false
 
     .then (json) =>