Index: email/folder.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/email_list/email/folder.php,v
retrieving revision 1.4
diff -c -r1.4 folder.php
*** email/folder.php	5 Aug 2008 17:07:53 -0000	1.4
--- email/folder.php	25 Aug 2008 11:41:05 -0000
***************
*** 263,270 ****
  		$mform = new folder_form('folder.php', array('id' =>$id, 'course' => $courseid, 'action' => ''));
  
  
! 		// Get form sended
! 	    if ( $form = $mform->get_data() ) {
  
  			$foldernew = new stdClass();
  
--- 263,272 ----
  		$mform = new folder_form('folder.php', array('id' =>$id, 'course' => $courseid, 'action' => ''));
  
  
! 		// if the form is cancelled
!                 if ($mform->is_cancelled()) {
!              		redirect($CFG->wwwroot.'/blocks/email_list/email/index.php?id='.$courseid, get_string('foldercancelled', 'email', NULL, EMAIL_LANG_PATH));
!                } else if ( $form = $mform->get_data() ) {
  
  			$foldernew = new stdClass();
  
Index: lang/en_utf8/email.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/email_list/lang/en_utf8/email.php,v
retrieving revision 1.6
diff -c -r1.6 email.php
*** lang/en_utf8/email.php	17 Aug 2008 18:02:48 -0000	1.6
--- lang/en_utf8/email.php	25 Aug 2008 11:41:06 -0000
***************
*** 34,39 ****
--- 34,40 ----
  $string['failmarkunreaded'] = 'Fail when mark eMail to unread';
  $string['failupdaterecord'] = 'Fail when update record in email_mail';
  $string['folder'] = 'Folder';
+ $string['foldercancelled'] = 'Cancelled';
  $string['folders'] = 'Folders';
  $string['for']= 'To';
  $string['forbiddencreatefolder'] = 'Sorry, but you do not currently have permissions to do create new subfolders';