--- langs/pvl_eng.php.orig	2006-02-05 18:00:56.000000000 -0500
+++ langs/pvl_eng.php	2006-03-20 01:46:25.465993553 -0500
@@ -839,6 +839,7 @@
 	'no_comment' => 'You should type something in the \'comment\'-field. Be sure to click on \'Post Comment\' to store it permanently.',
 	'too_many_hrefs' => 'The maximum number of hyperlinks was exceeded. Stop spamming.',
     'email_subject' => '[Comment] Re:',
+	'javascript' => 'Enable Javascript to store your comment.',
 );
 
 
--- modules/module_snippets.php.orig	2006-02-08 19:13:46.000000000 -0500
+++ modules/module_snippets.php	2006-03-20 01:50:31.782786032 -0500
@@ -1214,6 +1214,19 @@
 
 		$output = parse_step4($output);
 
+		if ($Weblogs[$Current_weblog]['encode_email_addresses']) {
+			$output .= <<<EOT
+<script type="text/javascript">
+<!--
+var first = 'en';
+var second = 'ab';
+var third = 'led';
+var e = document.getElementsByName('piv_javascript');
+e.item(0).value = first + second + third;
+// ->
+</script>
+EOT;
+		}
 	}
 
 	return $output;
--- submit.php.orig	2006-02-07 21:31:02.000000000 -0500
+++ submit.php	2006-03-20 01:48:26.519028324 -0500
@@ -375,6 +375,13 @@
 			unset($Pivot_Vars['post']);
 			$Pivot_Vars['preview'] = TRUE;
 
+		} else if ($Weblogs[$Current_weblog]['encode_email_addresses'] && $Pivot_Vars['piv_javascript'] != 'enabled') {
+
+			$entry['comments'][] = $my_comment;
+			$Pivot_Vars['message'] = lang('comment','javascript');
+			unset($Pivot_Vars['post']);
+			$Pivot_Vars['preview'] = TRUE;
+
 		} else if (!$duplicate)  {
 
 			// update the current entry
--- templates/_sub_commentform.html.orig	2006-01-02 21:29:30.000000000 -0500
+++ templates/_sub_commentform.html	2006-03-20 01:51:32.633782068 -0500
@@ -1,5 +1,6 @@
 <br />
 <form method="post" action="[[pivot_dir]]submit.php#message" id="form">
+<input type="hidden" name="piv_javascript" value="disabled">
 	<table border='0' cellspacing='0' cellpadding='0' width="98%" class="commentform">
 
 		<tr>