diff --git a/includes/webform.pages.inc b/includes/webform.pages.inc
index 97c9395..cfb8a93 100644
--- a/includes/webform.pages.inc
+++ b/includes/webform.pages.inc
@@ -155,6 +155,23 @@ function webform_configure_form($form, &$form_state, $node) {
     '#parents' => array('status'),
     '#options' => array(1 => t('Open'), 0 => t('Closed')),
   );
+
+  $form['submission']['storage'] = array(
+    '#type' => 'item',
+    '#title' => t('Storage Model'),
+    '#theme' => 'webform_advanced_storage_form',
+    '#description' => t('Choose the storage model for this webform.  Default is to store the submission in the main Drupal database.  Choose "None" if you do not want to store submissions.'),
+  );
+
+  $form['submission']['storage']['storage_model'] = array(
+    '#type' => 'select',
+    '#options' => array(
+      'database' => t('Database'),
+      'none' => t('None')
+    ),
+    '#default_value' => $node->webform['storage_model'],
+    '#parents' => array('storage_model'),
+  );
   /* End Edit Form */
 
   /* Start per-role submission control */
@@ -331,6 +348,9 @@ function webform_configure_form_submit($form, &$form_state) {
     $node->webform['total_submit_interval'] = $form_state['values']['total_submit_interval'];
   }
 
+  // Set the storage model
+  $node->webform['storage_model'] = $form_state['values']['storage_model'];
+
   // Set submit notice.
   $node->webform['submit_notice'] = $form_state['values']['submit_notice'];
 
diff --git a/includes/webform.report.inc b/includes/webform.report.inc
index 6ada86a..50f1aa6 100644
--- a/includes/webform.report.inc
+++ b/includes/webform.report.inc
@@ -158,7 +158,9 @@ function theme_webform_results_submissions_header($variables) {
  * Preprocess function for webform-results-submissions.tpl.php
  */
 function template_preprocess_webform_results_submissions(&$vars) {
-  $vars['node'] = $vars['element']['#node'];
+  $node = $vars['element']['#node'];
+  $vars['node'] = $node;
+  $vars['storage_model'] = $node->webform['storage_model'];
   $vars['submissions'] = $vars['element']['#submissions'];
   $vars['table'] = $vars['element']['table'];
   $vars['total_count'] = $vars['element']['#total_count'];
diff --git a/templates/webform-results-submissions.tpl.php b/templates/webform-results-submissions.tpl.php
index ce753ab..76def65 100644
--- a/templates/webform-results-submissions.tpl.php
+++ b/templates/webform-results-submissions.tpl.php
@@ -22,7 +22,14 @@
   <?php print theme('webform_results_per_page', array('total_count' => $total_count, 'pager_count' => $pager_count)); ?>
   <?php print render($table); ?>
 <?php else: ?>
-  <?php print t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))); ?>
+  <?php if ($storage_model == 'database'): ?>
+    <?php print t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))); ?>
+  <?php elseif ($storage_model == 'none'): ?>
+    <?php print t('This form does not store results. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))); ?>
+  <?php else: ?>
+    <?php print t('This form does not store results locally. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))); ?>
+  <?php endif; ?>
+
 <?php endif; ?>
 
 
diff --git a/webform.install b/webform.install
index 19dacf4..8a499e9 100644
--- a/webform.install
+++ b/webform.install
@@ -109,6 +109,13 @@ function webform_schema() {
         'not null' => TRUE,
         'default' => -1,
       ),
+      'storage_model' => array(
+        'description' => 'The method for storing submissions.  Defaults to "database".',
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => 'database',
+      ),
     ),
     'primary key' => array('nid'),
   );
@@ -831,3 +838,15 @@ function webform_update_7319(&$sandbox) {
 function webform_update_7320() {
   db_query("UPDATE {file_managed} SET status = 1 WHERE fid IN (SELECT fid FROM {file_usage} WHERE module = :module_name)", array(':module_name' => 'webform'));
 }
+
+
+/**
+ * Add the ability to set forms as email only.
+ */
+function webform_update_7321() {
+  if (!db_field_exists('webform', 'storage_model')) {    db_add_field('webform', 'storage_model', array('type' => 'varchar', 'length'
+ => '255', 'not null' => TRUE, 'default' => 'database', 'initial' => 'database')
+);
+  }
+}
+
diff --git a/webform.module b/webform.module
index 2fffd0c..55f2808 100644
--- a/webform.module
+++ b/webform.module
@@ -2439,36 +2439,44 @@ function webform_client_form_submit($form, &$form_state) {
     return;
   }
 
-  // Save the submission to the database.
-  if (!$sid) {
-    // No sid was found thus insert it in the dataabase.
-    $form_state['values']['details']['sid'] = $sid = webform_submission_insert($node, $submission);
-    $form_state['values']['details']['is_new'] = TRUE;
+  
+  if ('database' == $node->webform['storage_model']) {
+    // Save the submission to the database.
+    if (!$sid) {
+      // No sid was found thus insert it in the dataabase.
+      $form_state['values']['details']['sid'] = $sid = webform_submission_insert($node, $submission);
+      $form_state['values']['details']['is_new'] = TRUE;
+
+      // Set a cookie including the server's submission time.
+      // The cookie expires in the length of the interval plus a day to compensate for different timezones.
+      if (variable_get('webform_use_cookies', 0)) {
+        $cookie_name = 'webform-' . $node->nid;
+        $time = REQUEST_TIME;
+        $params = session_get_cookie_params();
+        setcookie($cookie_name . '[' . $time . ']', $time, $time + $node->webform['submit_interval'] + 86400, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+      }
 
-    // Set a cookie including the server's submission time.
-    // The cookie expires in the length of the interval plus a day to compensate for different timezones.
-    if (variable_get('webform_use_cookies', 0)) {
-      $cookie_name = 'webform-' . $node->nid;
-      $time = REQUEST_TIME;
-      $params = session_get_cookie_params();
-      setcookie($cookie_name . '[' . $time . ']', $time, $time + $node->webform['submit_interval'] + 86400, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+      // Save session information about this submission for anonymous users,
+      // allowing them to access or edit their submissions.
+      if (!$user->uid && user_access('access own webform submissions')) {
+        $_SESSION['webform_submission'][$form_state['values']['details']['sid']] = $node->nid;
+      }
     }
-
-    // Save session information about this submission for anonymous users,
-    // allowing them to access or edit their submissions.
-    if (!$user->uid && user_access('access own webform submissions')) {
-      $_SESSION['webform_submission'][$form_state['values']['details']['sid']] = $node->nid;
+    else {
+      // Sid was found thus update the existing sid in the database.
+      webform_submission_update($node, $submission);
+      $form_state['values']['details']['is_new'] = FALSE;
     }
   }
   else {
-    // Sid was found thus update the existing sid in the database.
-    webform_submission_update($node, $submission);
-    $form_state['values']['details']['is_new'] = FALSE;
+    $sid = NULL;
   }
 
   // Check if this form is sending an email.
   if (!$is_draft && !$form_state['values']['details']['finished']) {
-    $submission = webform_get_submission($node->webform['nid'], $sid, TRUE);
+    if ('database' == $node->webform['storage_model']) {
+      $submission = webform_get_submission($node->nid, $sid, TRUE);
+    }
     webform_submission_send_mail($node, $submission);
   }