diff --git a/core/modules/contact/src/MessageForm.php b/core/modules/contact/src/MessageForm.php
index 32fb4d5..da221ff 100644
--- a/core/modules/contact/src/MessageForm.php
+++ b/core/modules/contact/src/MessageForm.php
@@ -213,6 +213,10 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
   public function save(array $form, FormStateInterface $form_state) {
     $message = $this->entity;
     $user = $this->currentUser();
+    // Save the message. In core this is a no-op but should contrib wish to
+    // implement message storage, this will make the task of swapping in a real
+    // storage controller straight-forward.
+    $message->save();
     $this->mailHandler->sendMailMessages($message, $user);
     $contact_form = $message->getContactForm();
 
@@ -229,10 +233,6 @@ public function save(array $form, FormStateInterface $form_state) {
     else {
       $form_state->setRedirectUrl($contact_form->getRedirectUrl());
     }
-    // Save the message. In core this is a no-op but should contrib wish to
-    // implement message storage, this will make the task of swapping in a real
-    // storage controller straight-forward.
-    $message->save();
   }
 
 }