diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee
index b88879f59..17de5c286 100644
--- a/src/Filtering/Filter.coffee
+++ b/src/Filtering/Filter.coffee
@@ -171,6 +171,7 @@ Filter =
tripcode: (post) -> post.info.tripcode
capcode: (post) -> post.info.capcode
pass: (post) -> post.info.pass
+ email: (post) -> post.info.email
subject: (post) -> post.info.subject or (if post.isReply then undefined else '')
comment: (post) -> (post.info.comment ?= Build.parseComment post.info.commentHTML.innerHTML)
flag: (post) -> post.info.flag
@@ -256,6 +257,7 @@ Filter =
['Tripcode', 'tripcode']
['Capcode', 'capcode']
['Pass Date', 'pass']
+ ['Email', 'email']
['Subject', 'subject']
['Comment', 'comment']
['Flag', 'flag']
diff --git a/src/General/Settings/Filter-select.html b/src/General/Settings/Filter-select.html
index 1d8184c0a..6632f8258 100644
--- a/src/General/Settings/Filter-select.html
+++ b/src/General/Settings/Filter-select.html
@@ -7,6 +7,7 @@
+
diff --git a/src/classes/Post.coffee b/src/classes/Post.coffee
index 3db8b7ee7..7720e5171 100644
--- a/src/classes/Post.coffee
+++ b/src/classes/Post.coffee
@@ -28,6 +28,7 @@ class Post
@info =
subject: @nodes.subject?.textContent or undefined
name: @nodes.name?.textContent
+ email: if @nodes.email then decodeURIComponent(@nodes.email.href.replace(/^mailto:/, ''))
tripcode: @nodes.tripcode?.textContent
uniqueID: @nodes.uniqueID?.textContent
capcode: @nodes.capcode?.textContent.replace '## ', ''
diff --git a/src/config/Config.coffee b/src/config/Config.coffee
index 27fe8e729..46fbf1e2b 100644
--- a/src/config/Config.coffee
+++ b/src/config/Config.coffee
@@ -728,6 +728,8 @@ Config =
#/./
"""
+ email: ''
+
subject: """
# Filter Generals on /v/:
#/general/i;boards:v;op:only