diff -rb Recmail095a/Recmail.php Recmail.new/Recmail.php
24c24
< 			'mail_auto_signup'			=> OFF,
---
> 			'mail_unknown_address'		=> 'fallback',
36a37
> 			'mail_rejection_notice'		=> lang_get( 'mail_rejection_notice_default' ),
diff -rb Recmail095a/Recmail_api.php Recmail.new/Recmail_api.php
68c68,77
< 				mail_add_bug( $t_mail, $proj,$cat );
---
> 
> 				$t_reporter_id = mail_get_user( $t_mail['From'] );
> 				if ($t_reporter_id == 0) {
> 					// Reject the unknown sender
> 					mail_reject_unknown( $t_mail );
> 				} else {
> 					// Proceed normally
> 					mail_add_bug( $t_mail, $proj, $cat, $t_reporter_id );
> 				}
> 
179c188,190
< 		$t_mail_auto_signup	= plugin_config_get( 'mail_auto_signup' );
---
>         $t_mail_auto_signup 	= (plugin_config_get( 'mail_unknown_address' ) == 'signup');
>         $t_mail_auto_fallback	= (plugin_config_get( 'mail_unknown_address' ) == 'fallback');
>         $t_mail_auto_reject		= (plugin_config_get( 'mail_unknown_address' ) == 'reject');
199a211,215
>             } elseif ( ! $t_reporter_id && $t_mail_auto_reject ) {
>             	// Reject the unknown mail
>             	echo "Rejected unknown sender: $v_mailaddress<br />";
>             	return 0;
>             
243c259,265
< 	function mail_add_bug ( &$p_mail,$proj ,$cat ) {
---
>     function mail_add_bug ( &$p_mail,$proj, $cat, $reporter_id = -1 ) {
>     	if ($reporter_id == -1) {
> 	        $t_bug_data->reporter_id = mail_get_user( $p_mail['From'] );
> 	    } else {
> 	    	$t_bug_data->reporter_id = $reporter_id;
> 	    }
>     
280,281d301
< 		$t_bug_data->reporter_id		= mail_get_user( $p_mail['From'] );
< 	
287c307,308
< 				email_bugnote_add ( $t_bug_id );
---
>                 //// bugnote_add() already sent the email
>                 //email_bugnote_add ( $t_bug_id );
442a464,476
> 
> 
> 	# Send a rejection notice to the unrecognized sender.
> 	function mail_reject_unknown( $p_mail ) {
> 		$t_recipient = mail_parse_address($p_mail['From']);
> 		$t_subject = 're: '.$p_mail['Subject'];
> 		$t_message = plugin_config_get( 'mail_rejection_notice' );
> 		$t_message = str_replace('#address#', $t_recipient, $t_message);
> 
> 		email_store( $t_recipient, $t_subject, $t_message );
> 	}
> 
> 
diff -rb Recmail095a/lang/strings_english.txt Recmail.new/lang/strings_english.txt
7a8
> $s_mail_unknown_address         = 'How to handle mail from unknown addresses (see Doc)';
8a10,11
> $s_mail_auto_fallback           = 'Use default reporting account';
> $s_mail_auto_reject             = 'Reject';
41a45,46
> $s_mail_rejection_notice		= 'Mail Rejection Notice';
> $s_mail_rejection_notice_default= 'Our Mantis bug tracking system has received an email from your address. Normally the system would automatically add a new bug report using the email, but we are sorry that we do not recognize your email address of #address#. It is necessary that you use the same address that is in your Mantis user account. You may log in to our Mantis website and update your email address there, so that the system can properly accept emails from you in the future. Thank you.';
\ No newline at end of file
diff -rb Recmail095a/pages/bug_report_mail.php Recmail.new/pages/bug_report_mail.php
17c17
< 	header("Content-type: text/plain");
---
> 	//header("Content-type: text/plain");
23a24,26
> 
> 	plugin_push_current( 'Recmail' );
> 
diff -rb Recmail095a/pages/checkuser.php Recmail.new/pages/checkuser.php
13c13
< 	$mail .="@recmail.com";
---
> 	$mail .="@example.com";
diff -rb Recmail095a/pages/config.php Recmail.new/pages/config.php
59,63c59
< 		<?php echo lang_get( 'mail_auto_signup' ) ?>
< 	</td>
< 	<td class="center" width="20%">
< 		<label><input type="radio" name="mail_auto_signup" value="1" <?php echo ( ON == plugin_config_get( 'mail_auto_signup' ) ) ? 'checked="checked" ' : ''?>/>
< 			<?php echo lang_get( 'mail_format_enabled' ) ?></label>
---
> 		<?php echo lang_get( 'mail_unknown_address' ) ?>
64a61
> 
66,67c63,88
< 		<label><input type="radio" name="mail_auto_signup" value="0" <?php echo ( OFF == plugin_config_get( 'mail_auto_signup' ) ) ? 'checked="checked" ' : ''?>/>
< 			<?php echo lang_get( 'mail_format_disabled' ) ?></label>
---
> 		<?php 
> 			if (!$t_mail_auto_signup_default = plugin_config_get('mail_unknown_address')) {
> 				if (ON == plugin_config_get( 'mail_auto_signup' )) {
> 					$t_mail_auto_signup_default = 'signup';
> 				} else {
> 					$t_mail_auto_signup_default = 'fallback';
> 				}
> 			}
> 			$t_options = array(
> 				'signup' => lang_get( 'mail_auto_signup' ),
> 				'fallback' => lang_get( 'mail_auto_fallback' ),
> 				'reject' => lang_get( 'mail_auto_reject' ),
> 			);
> 		?>
> 		<label><select name="mail_unknown_address">
> 			<?php
> 				foreach ($t_options as $t_key => $t_val) {
> 					echo '<option value="'.$t_key.'"';
> 					if ($t_key == $t_mail_auto_signup_default) {
> 						echo ' selected';
> 					}
> 					echo '>'.$t_val.'</option>';
> 				}
> 			?>
> 		</select></label>
> 		
68a90
> 	<td></td>
287c309,318
< 
---
> <tr <?php echo helper_alternate_class() ?>>
> 	<td class="category" width="60%">
> 		<?php echo lang_get( 'mail_rejection_notice' ) ?>
> 	</td>
> 	<td class="center" colspan="2">
> 		<textarea name="mail_rejection_notice" rows="10" cols="60"><?php
> 			echo str_replace('"', '&quot;', plugin_config_get( 'mail_rejection_notice' )); 
> 		?></textarea>
> 	</td>
> </tr>
diff -rb Recmail095a/pages/config_edit.php Recmail.new/pages/config_edit.php
7c7
< $f_mail_auto_signup				= gpc_get_int('mail_auto_signup', OFF);
---
> $f_mail_unknown_address			= gpc_get_string('mail_unknown_address', 'fallback');
19a20
> $f_mail_rejection_notice		= gpc_get_string('mail_rejection_notice', lang_get('mail_rejection_notice_default'));
28c29,30
< plugin_config_set('mail_auto_signup'			, $f_mail_auto_signup);				
---
> //plugin_config_set('mail_auto_signup'			, $f_mail_auto_signup);				
> plugin_config_set('mail_unknown_address'        , $f_mail_unknown_address);
40a43
> plugin_config_set('mail_rejection_notice'		, $f_mail_rejection_notice);
Only in Recmail.new/pages: error_log
diff -rb Recmail095a/pages/setpop.php Recmail.new/pages/setpop.php
76c76
< 		<input type="text" name="mail_pop3_host" size="30" maxlength="30" />
---
> 		<input type="text" name="mail_pop3_host" size="30" maxlength="50" />