diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx
index c4157a825..29116e2f4 100644
--- a/internal_packages/composer/lib/composer-view.cjsx
+++ b/internal_packages/composer/lib/composer-view.cjsx
@@ -673,11 +673,11 @@ class ComposerView extends React.Component
     if warnings.length > 0 and not options.force
       dialog.showMessageBox remote.getCurrentWindow(), {
         type: 'warning',
-        buttons: ['Cancel', 'Send Anyway'],
+        buttons: ['Send Anyway', 'Cancel'],
         message: 'Are you sure?',
         detail: "Send #{warnings.join(' and ')}?"
       }, (response) =>
-        if response is 1 # button array index 1
+        if response is 0 # response is button array index
           @_sendDraft({force: true})
       return
 
diff --git a/internal_packages/composer/spec/composer-view-spec.cjsx b/internal_packages/composer/spec/composer-view-spec.cjsx
index 036023a82..4b7c59f62 100644
--- a/internal_packages/composer/spec/composer-view-spec.cjsx
+++ b/internal_packages/composer/spec/composer-view-spec.cjsx
@@ -378,7 +378,7 @@ describe "populated composer", ->
         expect(Actions.sendDraft).not.toHaveBeenCalled()
         expect(@dialog.showMessageBox).toHaveBeenCalled()
         dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
-        expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
+        expect(dialogArgs.buttons).toEqual ['Send Anyway', 'Cancel']
 
       it "does not warn if the body of the email is all quoted text, but the email is a forward", ->
         useDraft.call @,
@@ -407,7 +407,7 @@ describe "populated composer", ->
       expect(Actions.sendDraft).not.toHaveBeenCalled()
       expect(@dialog.showMessageBox).toHaveBeenCalled()
       dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
-      expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
+      expect(dialogArgs.buttons).toEqual ['Send Anyway', 'Cancel']
 
     it "doesn't show a warning if requirements are satisfied", ->
       useFullDraft.apply(@); makeComposer.call(@)
@@ -422,7 +422,7 @@ describe "populated composer", ->
         expect(Actions.sendDraft).not.toHaveBeenCalled()
         expect(@dialog.showMessageBox).toHaveBeenCalled()
         dialogArgs = @dialog.showMessageBox.mostRecentCall.args[1]
-        expect(dialogArgs.buttons).toEqual ['Cancel', 'Send Anyway']
+        expect(dialogArgs.buttons).toEqual ['Send Anyway', 'Cancel']
 
       noWarn = (body) ->
         useDraft.call @, subject: "Subject", to: [u1], body: body