diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index dc88da9183..2bb44213f4 100644
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -1371,6 +1371,7 @@ function update_Db_course($courseDbName)
 			  answered int NOT NULL,
 			  invite_mail text NOT NULL,
 			  reminder_mail text NOT NULL,
+			  mail_subject VARCHAR( 255 ) NOT NULL,
 			  anonymous enum('0','1') NOT NULL default '0',
 			  access_condition TEXT DEFAULT NULL,
 			  PRIMARY KEY  (survey_id)
diff --git a/main/install/migrate-db-1.8.5-1.8.6-pre.sql b/main/install/migrate-db-1.8.5-1.8.6-pre.sql
index 41e76db0f6..378d85e9cf 100644
--- a/main/install/migrate-db-1.8.5-1.8.6-pre.sql
+++ b/main/install/migrate-db-1.8.5-1.8.6-pre.sql
@@ -19,4 +19,5 @@
 -- xxUSERxx
 
 -- xxCOURSExx
-ALTER TABLE lp ADD theme varchar(255) not null default '';
\ No newline at end of file
+ALTER TABLE lp ADD theme varchar(255) not null default '';
+ALTER TABLE survey ADD mail_subject VARCHAR( 255 ) NOT NULL AFTER reminder_mail ;
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index 2fd52e82d9..1b3ddcf332 100644
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -23,7 +23,7 @@
 /**
 *	@package dokeos.survey
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts (if not all) of the code
-* 	@version $Id: survey.lib.php 15616 2008-06-25 10:21:57Z elixir_inter $
+* 	@version $Id: survey.lib.php 15640 2008-06-27 14:17:54Z elixir_inter $
 *
 * 	@todo move this file to inc/lib
 * 	@todo use consistent naming for the functions (save vs store for instance)
@@ -3490,7 +3490,7 @@ class SurveyUtil {
 	 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 	 * @version January 2007
 	 */
-	function save_invite_mail($mailtext, $reminder=0)
+	function save_invite_mail($mailtext, $mail_subject, $reminder=0)
 	{
 		// Database table definition
 		$table_survey 					= Database :: get_course_table(TABLE_SURVEY);
@@ -3505,7 +3505,7 @@ class SurveyUtil {
 			$mail_field = 'reminder_mail';
 		}
 	
-		$sql = "UPDATE $table_survey SET $mail_field = '".Database::escape_string($mailtext)."' WHERE survey_id = '".Database::escape_string($_GET['survey_id'])."'";
+		$sql = "UPDATE $table_survey SET mail_subject='".Database::escape_string($mail_subject)."', $mail_field = '".Database::escape_string($mailtext)."' WHERE survey_id = '".Database::escape_string($_GET['survey_id'])."'";
 		$result = api_sql_query($sql, __FILE__, __LINE__);
 	}
 	
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index 35bd3f01cb..d62ee5eef9 100644
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -144,7 +144,7 @@ if ($form->validate())
 {
 	$values = $form->exportValues();
 	// save the invitation mail
-	SurveyUtil::save_invite_mail($values['mail_text'], !empty($survey_data['invite_mail']));
+	SurveyUtil::save_invite_mail($values['mail_text'], $values['mail_title'], !empty($survey_data['invite_mail']));
 	// saving the invitations for the course users
 	$count_course_users = SurveyUtil::save_invitations($values['course_users'], $values['mail_title'], $values['mail_text'], $values['resend_to_all'], $values['send_mail']);
 	// saving the invitations for the additional users
@@ -174,6 +174,7 @@ else
 	{
 		$defaults['mail_text'] = $survey_data['invite_mail'];
 	}
+	$defaults['mail_title'] = $survey_data['mail_subject'];
 	$defaults['send_mail'] = 1;	
 	$form->setDefaults($defaults);