diff --git a/core/modules/contact/src/ContactFormExtraInterface.php b/core/modules/contact/src/ContactFormExtraInterface.php
new file mode 100644
index 0000000..a3aaf16
--- /dev/null
+++ b/core/modules/contact/src/ContactFormExtraInterface.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\contact\ContactFormExtraInterface.
+ */
+
+namespace Drupal\contact;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface defining a contact form entity.
+ */
+interface ContactFormExtraInterface extends ConfigEntityInterface {
+
+  /**
+   * Returns the message to be displayed to user.
+   *
+   * @return string
+   *   A user message.
+   */
+  public function getMessage();
+
+  /**
+   * Returns the path for redirect.
+   *
+   * @return string
+   *   The redirect path.
+   */
+  public function getRedirectPath();
+
+  /**
+   * Returns the url object for redirect path.
+   *
+   * Empty redirect property results a url object of front page.
+   *
+   * @return \Drupal\core\Url
+   *   The redirect url object.
+   */
+  public function getRedirectUrl();
+
+  /**
+   * Sets the message to be displayed to the user.
+   *
+   * @param string $message
+   *   The message to display after form is submitted.
+   *
+   * @return $this
+   */
+  public function setMessage($message);
+
+  /**
+   * Sets the redirect path.
+   *
+   * @param string $redirect
+   *   The desired path.
+   *
+   * @return $this
+   */
+  public function setRedirectPath($redirect);
+
+}
diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php
index 11f3ec3..0aaf9a4 100644
--- a/core/modules/contact/src/ContactFormInterface.php
+++ b/core/modules/contact/src/ContactFormInterface.php
@@ -15,14 +15,6 @@
 interface ContactFormInterface extends ConfigEntityInterface {
 
   /**
-   * Returns the message to be displayed to user.
-   *
-   * @return string
-   *   A user message.
-   */
-  public function getMessage();
-
-  /**
    * Returns list of recipient email addresses.
    *
    * @return array
@@ -31,24 +23,6 @@ public function getMessage();
   public function getRecipients();
 
   /**
-   * Returns the path for redirect.
-   *
-   * @return string
-   *   The redirect path.
-   */
-  public function getRedirectPath();
-
-  /**
-   * Returns the url object for redirect path.
-   *
-   * Empty redirect property results a url object of front page.
-   *
-   * @return \Drupal\core\Url
-   *   The redirect url object.
-   */
-  public function getRedirectUrl();
-
-  /**
    * Returns an auto-reply message to send to the message author.
    *
    * @return string
@@ -65,16 +39,6 @@ public function getReply();
   public function getWeight();
 
   /**
-   * Sets the message to be displayed to the user.
-   *
-   * @param string $message
-   *   The message to display after form is submitted.
-   *
-   * @return $this
-   */
-  public function setMessage($message);
-
-  /**
    * Sets list of recipient email addresses.
    *
    * @param array $recipients
@@ -85,16 +49,6 @@ public function setMessage($message);
   public function setRecipients($recipients);
 
   /**
-   * Sets the redirect path.
-   *
-   * @param string $redirect
-   *   The desired path.
-   *
-   * @return $this
-   */
-  public function setRedirectPath($redirect);
-
-  /**
    * Sets an auto-reply message to send to the message author.
    *
    * @param string $reply
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 7320ddd..3759c79 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
 use Drupal\contact\ContactFormInterface;
+use Drupal\contact\ContactFormExtraInterface;
 use Drupal\Core\Url;
 
 /**
@@ -50,7 +51,7 @@
  *   }
  * )
  */
-class ContactForm extends ConfigEntityBundleBase implements ContactFormInterface {
+class ContactForm extends ConfigEntityBundleBase implements ContactFormInterface, ContactFormExtraInterface {
 
   /**
    * The form ID.