diff --git a/4chan_x.user.js b/4chan_x.user.js
index 0651aa00c..50c838501 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -629,7 +629,7 @@
     email: function(post) {
       var mail;
       if (mail = $('.useremail', post.el)) {
-        return mail.pathname;
+        return mail.href.slice(7);
       }
       return false;
     },
@@ -2217,6 +2217,7 @@
       <li>Year: %y</li>\
       <li>Hour: %k, %H, %l (lowercase L), %I (uppercase i), %p, %P</li>\
       <li>Minutes: %M</li>\
+      <li>Seconds: %S</li>\
     </ul>\
     <div class=warning><code>File Info Formatting</code> is disabled.</div>\
     <ul>\
diff --git a/script.coffee b/script.coffee
index 971fd14d2..8ddf6aa26 100644
--- a/script.coffee
+++ b/script.coffee
@@ -498,7 +498,8 @@ Filter =
     false
   email: (post) ->
     if mail = $ '.useremail', post.el
-      return mail.pathname
+      # remove 'mailto:'
+      return mail.href[7..]
     false
   subject: (post) ->
     $('.subject', post.el).textContent or false