Index: site/App/Form/Abstract/View.php
===================================================================
--- site/App/Form/Abstract/View.php	(revision 5736)
+++ site/App/Form/Abstract/View.php	(revision 5738)
@@ -246,34 +246,10 @@
 
     protected function _getThankYouMessage()
     {
-        $content = '';
-
-        $currentItem = str_replace(array('App_', 'App\\', 'View'), '', get_class($this));
-        $currentPage = Qs_SiteMap::findFirst(null, array('type' => $currentItem));
-
-        if ($currentPage
-            && !empty($currentPage['sub'])
-            && array_key_exists($this->_thanksPageAlias, $currentPage['sub'])
-        ) {
-            $page = $currentPage['sub'][$this->_thanksPageAlias];
-            $htmlBlock = null;
-
-            foreach ($page['items'] as $item) {
-                if ($item['type'] == 'HtmlBlock_') {
-                    $htmlBlock = $item;
-                    break;
-                }
-            }
-
-            if (!empty($htmlBlock)) {
-                $htmlBlockView = new App_HtmlBlock_View($htmlBlock);
-                $data = $htmlBlockView->getData();
-                if (is_array($data) && array_key_exists('content', $data)) {
-                    $content = $data['content'];
-                }
-            }
-        }
-
-        return ($content) ? $content : $this->getConfig('thanksPageDefaultMessage');
+        $settingsField = $this->_settingsPrefix . 'ThanksMessage';
+        if (($message = App_Settings_Obj::get($settingsField))) {
+            return $message;
+        };
+        return $this->getConfig('thanksPageDefaultMessage');
     }
 }
Index: .updates/5736-QSF-185-contact-form.sql
===================================================================
--- .updates/5736-QSF-185-contact-form.sql	(revision 0)
+++ .updates/5736-QSF-185-contact-form.sql	(revision 5738)
@@ -0,0 +1,8 @@
+-- remove page contact/thanks.html
+
+INSERT INTO `qs_Settings` (`name`, `idCategory`, `fieldType`, `label`, `value`, `options`, `description`, `required`, `system`, `sorter`, `added`, `changed`) VALUES
+('contactFormEmailThanksMessage', 1, 'htmlEditor', 'Thank You Message for Contact Form', '<p style="text-align: center;"><strong>Thank you, your submission has been received. </strong></p>\r\n\r\n<p style="text-align: center;"><strong>We will respond to you shortly.</strong></p>\r\n', '', '', 'n', 'n', 832, NOW(), NOW());
+
+INSERT INTO `qs_SettingsOptions` (`name`, `variable`, `value`, `type`, `sorter`) VALUES
+('contactFormEmailThanksMessage', 'height', '200', 'int', NULL),
+('contactFormEmailThanksMessage', 'mode', 'view', 'string', NULL);