diff --git a/en/newsletter.php b/en/newsletter.php
index 8a5201b..844bf11 100644
--- a/en/newsletter.php
+++ b/en/newsletter.php
@@ -44,10 +44,11 @@
 		if (!empty($_GET['code'])) {
 			if (file_get_contents($filename) == $_GET['code']) {
 				if ($_GET['action'] == "sub") {
-					file_put_contents($filename, $code . PHP_EOL, FILE_APPEND);
+					file_put_contents("/var/spool/list", $email . PHP_EOL, FILE_APPEND);
 				} else {
 					$contents = file_get_contents("/var/spool/list");
-					$contents = str_replace($line . PHP_EOL, '', $contents);
+					$contents = preg_replace("/^" . preg_quote($email) . "$/", '', $contents);
+					$contents = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $contents);
 					file_put_contents("/var/spool/list", $contents);
 				}
 				unlink($filename);