diff --git a/4chan_x.user.js b/4chan_x.user.js
index ed3a2529e..108abf825 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3720,7 +3720,7 @@
         capcode: data.capcode,
         tripcode: data.trip,
         uniqueID: data.id,
-        email: data.email ? encodeURIComponent(data.email) : '',
+        email: data.email ? encodeURIComponent(data.email.replace(/"/g, '"')) : '',
         subject: data.sub,
         flagCode: data.country,
         flagName: data.country_name,
diff --git a/script.coffee b/script.coffee
index c7f892ead..37bd92065 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2924,7 +2924,7 @@ Build =
       capcode:  data.capcode
       tripcode: data.trip
       uniqueID: data.id
-      email:    if data.email then encodeURIComponent data.email else ''
+      email:    if data.email then encodeURIComponent data.email.replace /"/g, '"' else ''
       subject:  data.sub
       flagCode: data.country
       flagName: data.country_name