diff --git a/fuel/app/tasks/pannous.php b/fuel/app/tasks/pannous.php
index bed8db1..2a7ab65 100644
--- a/fuel/app/tasks/pannous.php
+++ b/fuel/app/tasks/pannous.php
@@ -107,6 +107,8 @@ class Pannous {
             "List-Id: <"  . \Config::get('base_url') . "/lists/" . $list->id . ">",
             "List-URL: <" . \Config::get('base_url') . "/lists/" . $list->id . ">",
             "List-Post: <mailto:" . $list->email . ">",
+            "List-Subscribe: <mailto:" . $list->email . "?subject=Subscribe>",
+            "List-Unsubscribe: <mailto:" . $list->email . "?subject=Unsubscribe>",
             //"List-Subscribe: <" . \Config::get('base_url') . "/lists/" . $list->id . "/subscribe>",
 
             "Message-ID: <" . sha1(date("U.u") . $mail->from) . "@" . $list->email . ">", // U is seconds since 1900 and u is microseconds
@@ -137,8 +139,6 @@ class Pannous {
         {
 	    \Log::debug("Propagate to " . $user->email);
             $target_headers = $headers;
-            array_push($target_headers, "List-Unsubscribe: <" . \Config::get('base_url') . "/lists/" . $list->id . "/unsubscribe/" . $list->generateSubscribeToken($user) . ">");
-
             /* echo "======================\n"; */
             /* echo "==> To " . $user->email . "\r\n"; */
             /* echo "==> Subject " . $subject . "\r\n"; */