diff --git a/app/models/user.rb b/app/models/user.rb
index 4cbb757..e4a609d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -31,7 +31,7 @@ class User < ActiveRecord::Base
   attr_accessible :username, :email, :password, :password_confirmation,
     :about, :email_replies, :pushover_replies, :pushover_user_key,
     :pushover_device, :email_messages, :pushover_messages, :email_mentions,
-    :pushover_mentions
+    :pushover_mentions, :mailing_list_enabled
 
   before_save :check_session_token
   before_create :create_rss_token, :create_mailing_list_token
diff --git a/app/views/settings/index.html.erb b/app/views/settings/index.html.erb
index 91197fc..9ec5a8c 100644
--- a/app/views/settings/index.html.erb
+++ b/app/views/settings/index.html.erb
@@ -126,6 +126,36 @@
       </span>
     </div>
 
+    <br>
+
+    <div class="legend">
+      Mailing List Settings
+    </div>
+
+    <p>
+    When enabled, you will receive all newly submitted stories and comments to
+    your e-mail address entered above, except those stories (and their
+    comments) filtered by your <a href="/filters">tag filters</a>.  All e-mail
+    messages will appear to be sent to your private list address shown below
+    which you can filter on, and e-mails you send to that address will be
+    posted under your account on this website.  You should keep your unique
+    list address private to prevent others from posting comments as you.
+    </p>
+
+    <div class="boxline">
+      <%= f.label :mailing_list_enabled, "Receive List E-mails:",
+        :class => "required" %>
+      <%= f.check_box :mailing_list_enabled%>
+    </div>
+
+    <div class="boxline">
+      <%= f.label :pushover_messages, "List Address:",
+        :class => "required" %>
+      <span>
+      <tt>lobsters-<%= @edit_user.mailing_list_token %>@lobste.rs</tt>
+      </span>
+    </div>
+
     <br>
     <%= f.submit "Save All Settings" %>
   <% end %>