Index: application/controllers/admin/database.php
===================================================================
--- application/controllers/admin/database.php	(revision 11315)
+++ application/controllers/admin/database.php	(working copy)
@@ -1031,6 +1031,7 @@
             'showprogress'=> $this->input->post('showprogress'),
             'listpublic'=> $this->input->post('public'),
             'htmlemail'=> $this->input->post('htmlemail'),
+            'sendconfirmation'=> $this->input->post('sendconfirmation'),
             'tokenanswerspersistence'=> $this->input->post('tokenanswerspersistence'),
             'alloweditaftercompletion'=> $this->input->post('alloweditaftercompletion'),
             'usecaptcha'=> $this->input->post('usecaptcha'),
Index: application/controllers/admin/emailtemplates.php
===================================================================
--- application/controllers/admin/emailtemplates.php	(revision 11315)
+++ application/controllers/admin/emailtemplates.php	(working copy)
@@ -164,7 +164,12 @@
             $sHTMLOutput .="</ul></div>"
 
             ."<div id='tab-{$grouplang}-confirmation'>";
-            $sHTMLOutput .= "<ul><li><label for='email_confirm_subj_{$grouplang}'>".$clang->gT("Confirmation email subject:")."</label>\n"
+            $sHTMLOutput .= "<ul>";
+            if($surveyinfo['sendconfirmation'] == 'N')
+			{
+			    $sHTMLOutput .= "<li><span class='warningtext'>".$clang->gT("No confirmation emails will be sent. To send emails see Survey properties.")."</span></li>\n";
+			}
+            $sHTMLOutput .= "<li><label for='email_confirm_subj_{$grouplang}'>".$clang->gT("Confirmation email subject:")."</label>\n"
             . "<input type='text' size='80' name='email_confirm_subj_".$esrow['surveyls_language']."' id='email_confirm_subj_{$grouplang}' value=\"{$esrow['surveyls_email_confirm_subj']}\" />\n"
             . "<input type='hidden' name='email_confirm_subj_default_".$esrow['surveyls_language']."' id='email_confirm_subj_default_{$grouplang}' value='{$aDefaultTexts['confirmation_subject']}' />\n"
             . "<input type='button' value='".$clang->gT("Use default")."' onclick='javascript: fillin(\"email_confirm_subj_{$grouplang}\",\"email_confirm_subj_default_{$grouplang}\")' />\n"
Index: application/controllers/admin/survey.php
===================================================================
--- application/controllers/admin/survey.php	(revision 11315)
+++ application/controllers/admin/survey.php	(working copy)
@@ -1380,6 +1380,7 @@
             $esrow['usecookie']                = 'N';
             $esrow['usecaptcha']               = 'D';
             $esrow['htmlemail']                = 'Y';
+            $esrow['sendconfirmation']         = 'Y';
             $esrow['emailnotificationto']      = '';
             $esrow['anonymized']               = 'N';
             $esrow['datestamp']                = 'N';
@@ -1771,6 +1772,7 @@
             'printanswers'=>$this->input->post('printanswers'),
             'listpublic'=>$this->input->post('public'),
             'htmlemail'=>$this->input->post('htmlemail'),
+            'sendconfirmation'=>$this->input->post('sendconfirmation'),
             'tokenanswerspersistence'=>$this->input->post('tokenanswerspersistence'),
             'alloweditaftercompletion'=>$this->input->post('alloweditaftercompletion'),
             'usecaptcha'=>$this->input->post('usecaptcha'),
Index: application/helpers/frontend_helper.php
===================================================================
--- application/helpers/frontend_helper.php	(revision 11315)
+++ application/helpers/frontend_helper.php	(working copy)
@@ -1257,7 +1257,7 @@
                 }
 
                 //Only send confirmation email if there is a valid email address
-                if (validate_email($cnfrow['email']))
+                if (validate_email($cnfrow['email']) && $thissurvey['sendconfirmation'] == "Y")
                 {
                     SendEmailMessage($message, $subject, $to, $from, $sitename,$ishtml);
                 }
Index: application/helpers/update/upgrade-mssql_helper.php
===================================================================
--- application/helpers/update/upgrade-mssql_helper.php	(revision 11315)
+++ application/helpers/update/upgrade-mssql_helper.php	(working copy)
@@ -155,6 +155,7 @@
         }
 
         modify_database("","ALTER TABLE [prefix_surveys] ADD [htmlemail] CHAR(1) DEFAULT 'N'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("","ALTER TABLE [prefix_surveys] ADD [sendconfirmation] CHAR(1) DEFAULT 'Y'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","ALTER TABLE [prefix_surveys] ADD [usecaptcha] CHAR(1) DEFAULT 'N'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","ALTER TABLE [prefix_surveys] ADD [tokenanswerspersistence] CHAR(1) DEFAULT 'N'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","ALTER TABLE [prefix_users] ADD [htmleditormode] CHAR(7) DEFAULT 'default'"); echo $modifyoutput; flush();ob_flush();
Index: application/helpers/update/upgrade-mssqlnative_helper.php
===================================================================
--- application/helpers/update/upgrade-mssqlnative_helper.php	(revision 11315)
+++ application/helpers/update/upgrade-mssqlnative_helper.php	(working copy)
@@ -155,6 +155,7 @@
         }
 
         modify_database("","ALTER TABLE [prefix_surveys] ADD [htmlemail] CHAR(1) DEFAULT 'N'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("","ALTER TABLE [prefix_surveys] ADD [sendconfirmation] CHAR(1) DEFAULT 'Y'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","ALTER TABLE [prefix_surveys] ADD [usecaptcha] CHAR(1) DEFAULT 'N'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","ALTER TABLE [prefix_surveys] ADD [tokenanswerspersistence] CHAR(1) DEFAULT 'N'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","ALTER TABLE [prefix_users] ADD [htmleditormode] CHAR(7) DEFAULT 'default'"); echo $modifyoutput; flush();ob_flush();
Index: application/helpers/update/upgrade-mysql_helper.php
===================================================================
--- application/helpers/update/upgrade-mysql_helper.php	(revision 11315)
+++ application/helpers/update/upgrade-mysql_helper.php	(working copy)
@@ -161,6 +161,7 @@
 
 
         modify_database("","ALTER TABLE `prefix_surveys` ADD `htmlemail` CHAR(1) default 'N'"); echo $modifyoutput; flush();@ob_flush();
+        modify_database("","ALTER TABLE `prefix_surveys` ADD `sendconfirmation` CHAR(1) default 'Y'"); echo $modifyoutput; flush();@ob_flush();
         modify_database("","ALTER TABLE `prefix_surveys` ADD `tokenanswerspersistence` CHAR(1) default 'N'"); echo $modifyoutput; flush();@ob_flush();
         modify_database("","ALTER TABLE `prefix_surveys` ADD `usecaptcha` CHAR(1) default 'N'"); echo $modifyoutput; flush();@ob_flush();
         modify_database("","ALTER TABLE `prefix_users` ADD `htmleditormode` CHAR(7) default 'default'"); echo $modifyoutput; flush();@ob_flush();
Index: application/views/admin/survey/subview/tabTokens_view.php
===================================================================
--- application/views/admin/survey/subview/tabTokens_view.php	(revision 11315)
+++ application/views/admin/survey/subview/tabTokens_view.php	(working copy)
@@ -100,7 +100,23 @@
             </select>
         </li>
 
+        <li>
+            <label for='sendconfirmation'><?php echo $clang->gT("Send confirmation emails?"); ?></label>
+            <select name='sendconfirmation' id='sendconfirmation'>
+                <option value='Y'
+                <?php if ($esrow['sendconfirmation'] == "Y") { ?>
+                    selected='selected'
+                <?php } ?>
+                ><?php echo $clang->gT("Yes"); ?></option>
+                <option value='N'
+                <?php if ($esrow['sendconfirmation'] == "N") { ?>
+                selected='selected'
+                <?php } ?>
+                ><?php echo $clang->gT("No"); ?></option>
+            </select>
+        </li>
 
+
          <li><label for='tokenlength'><?php echo $clang->gT("Set token length to:"); ?></label>
          <input type='text' value="<?php echo $esrow['tokenlength']; ?>" name='tokenlength' id='tokenlength' size='12' maxlength='2' onkeypress="return goodchars(event,'0123456789')" />
          </li>
Index: installer/sql/create-mssql.sql
===================================================================
--- installer/sql/create-mssql.sql	(revision 11315)
+++ installer/sql/create-mssql.sql	(working copy)
@@ -293,6 +293,7 @@
   [publicstatistics] char(1) default 'N',
   [publicgraphs] char(1) default 'N',
   [htmlemail] char(1) default 'N',
+  [sendconfirmation] char(1) default 'Y',
   [tokenanswerspersistence] char(1) default 'N',
   [assessments] char(1) default 'N',
   [usecaptcha] char(1) default 'N',
Index: installer/sql/create-mssqlnative.sql
===================================================================
--- installer/sql/create-mssqlnative.sql	(revision 11315)
+++ installer/sql/create-mssqlnative.sql	(working copy)
@@ -302,6 +302,7 @@
   [publicstatistics] char(1) default 'N',
   [publicgraphs] char(1) default 'N',
   [htmlemail] char(1) default 'N',
+  [sendconfirmation] char(1) default 'Y',
   [tokenanswerspersistence] char(1) default 'N',
   [assessments] char(1) default 'N',
   [usecaptcha] char(1) default 'N',
Index: installer/sql/create-mysql.sql
===================================================================
--- installer/sql/create-mysql.sql	(revision 11315)
+++ installer/sql/create-mysql.sql	(working copy)
@@ -276,6 +276,7 @@
   `publicgraphs` char(1) default 'N',
   `listpublic` char(1) default 'N',
   `htmlemail` char(1) default 'N',
+  `sendconfirmation` char(1) default 'Y',
   `tokenanswerspersistence` char(1) default 'N',
   `assessments` char(1) default 'N', 
   `usecaptcha` char(1) default 'N',
Index: installer/sql/create-postgre.sql
===================================================================
--- installer/sql/create-postgre.sql	(revision 11315)
+++ installer/sql/create-postgre.sql	(working copy)
@@ -291,6 +291,7 @@
     publicstatistics character(1) DEFAULT 'N'::bpchar,
     publicgraphs character(1) DEFAULT 'N'::bpchar,
     htmlemail character(1) DEFAULT 'N'::bpchar,
+    sendconfirmation character(1) DEFAULT 'Y'::bpchar,
     tokenanswerspersistence character(1) DEFAULT 'N'::bpchar,
     assessments character(1) DEFAULT 'N'::bpchar,
     usecaptcha character(1) DEFAULT 'N'::bpchar,
Index: styles/admin/default/adminstyle.css
===================================================================
--- styles/admin/default/adminstyle.css	(revision 11315)
+++ styles/admin/default/adminstyle.css	(working copy)
@@ -1054,6 +1054,14 @@
     color: #121A28;
 }
 
+.form30newtabs li .warningtext,
+.form30 li .warningtext {
+	display: block;
+    margin: 3px 0 10px 30.5%;
+    font-weight: bold;
+    color: #EE0000;
+}
+
 .form30 table {
     width: auto;
     float: left;